diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-09-16 15:52:30 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-09-16 15:52:40 +0200 |
| commit | 8144bf0397ee1913b830d82058ccd40df741f1b3 (patch) | |
| tree | 7f707615c104621226fd8bdd868f86aee8e5bd73 /src/CudaBackProjectionAlgorithm3D.cpp | |
| parent | 47b520d51fc4fc49db992b9117f6c0abfa8152b5 (diff) | |
| parent | c1713c00c4aeae594913667d868106e8591dd1d1 (diff) | |
| download | astra-8144bf0397ee1913b830d82058ccd40df741f1b3.tar.gz astra-8144bf0397ee1913b830d82058ccd40df741f1b3.tar.bz2 astra-8144bf0397ee1913b830d82058ccd40df741f1b3.tar.xz astra-8144bf0397ee1913b830d82058ccd40df741f1b3.zip | |
Merge branch 'master'
Diffstat (limited to 'src/CudaBackProjectionAlgorithm3D.cpp')
| -rw-r--r-- | src/CudaBackProjectionAlgorithm3D.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/CudaBackProjectionAlgorithm3D.cpp b/src/CudaBackProjectionAlgorithm3D.cpp index fbb8f28..e8e0433 100644 --- a/src/CudaBackProjectionAlgorithm3D.cpp +++ b/src/CudaBackProjectionAlgorithm3D.cpp @@ -32,6 +32,7 @@ $Id$ #include "astra/AstraObjectManager.h" +#include "astra/CudaProjector3D.h" #include "astra/ConeProjectionGeometry3D.h" #include "astra/ParallelProjectionGeometry3D.h" #include "astra/ParallelVecProjectionGeometry3D.h" @@ -102,9 +103,20 @@ bool CCudaBackProjectionAlgorithm3D::initialize(const Config& _cfg) return false; } + CCudaProjector3D* pCudaProjector = 0; + pCudaProjector = dynamic_cast<CCudaProjector3D*>(m_pProjector); + if (!pCudaProjector) { + // TODO: Report + } + m_iGPUIndex = (int)_cfg.self.getOptionNumerical("GPUindex", -1); CC.markOptionParsed("GPUindex"); - m_iVoxelSuperSampling = (int)_cfg.self.getOptionNumerical("VoxelSuperSampling", 1); + + + m_iVoxelSuperSampling = 1; + if (pCudaProjector) + m_iVoxelSuperSampling = pCudaProjector->getVoxelSuperSampling(); + m_iVoxelSuperSampling = (int)_cfg.self.getOptionNumerical("VoxelSuperSampling", m_iVoxelSuperSampling); CC.markOptionParsed("VoxelSuperSampling"); CFloat32ProjectionData3DMemory* pSinoMem = dynamic_cast<CFloat32ProjectionData3DMemory*>(m_pSinogram); |