diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-12-01 06:00:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 06:00:19 -0800 |
| commit | 75ae79136451cad28375c1bbce6e6cac6080f29e (patch) | |
| tree | 4da463b6f94f20b1da4167e9e5f9827316e85f6c /src/CompositeGeometryManager.cpp | |
| parent | 08b14da8cf13d4fe9dcc4787306991e453976494 (diff) | |
| parent | 55dabbf035b55f71c4261c9de7ef572da46300ff (diff) | |
| download | astra-75ae79136451cad28375c1bbce6e6cac6080f29e.tar.gz astra-75ae79136451cad28375c1bbce6e6cac6080f29e.tar.bz2 astra-75ae79136451cad28375c1bbce6e6cac6080f29e.tar.xz astra-75ae79136451cad28375c1bbce6e6cac6080f29e.zip | |
Merge pull request #84 from wjp/expose_ConeBP_density_weighting
Expose the density weighting option of cone_bp
Diffstat (limited to 'src/CompositeGeometryManager.cpp')
| -rw-r--r-- | src/CompositeGeometryManager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp index f72f38a..c3af228 100644 --- a/src/CompositeGeometryManager.cpp +++ b/src/CompositeGeometryManager.cpp @@ -1228,10 +1228,12 @@ static bool doJob(const CCompositeGeometryManager::TJobSet::const_iterator& iter Cuda3DProjectionKernel projKernel = ker3d_default; int detectorSuperSampling = 1; int voxelSuperSampling = 1; + bool densityWeighting = false; if (projector) { projKernel = projector->getProjectionKernel(); detectorSuperSampling = projector->getDetectorSuperSampling(); voxelSuperSampling = projector->getVoxelSuperSampling(); + densityWeighting = projector->getDensityWeighting(); } size_t inx, iny, inz; @@ -1274,7 +1276,7 @@ static bool doJob(const CCompositeGeometryManager::TJobSet::const_iterator& iter ASTRA_DEBUG("CCompositeGeometryManager::doJobs: doing BP"); - ok = astraCUDA3d::BP(((CCompositeGeometryManager::CProjectionPart*)j.pInput.get())->pGeom, inputMem, ((CCompositeGeometryManager::CVolumePart*)j.pOutput.get())->pGeom, outputMem, voxelSuperSampling); + ok = astraCUDA3d::BP(((CCompositeGeometryManager::CProjectionPart*)j.pInput.get())->pGeom, inputMem, ((CCompositeGeometryManager::CVolumePart*)j.pOutput.get())->pGeom, outputMem, voxelSuperSampling, densityWeighting); if (!ok) ASTRA_ERROR("Error performing sub-BP"); ASTRA_DEBUG("CCompositeGeometryManager::doJobs: BP done"); } |