diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-06-26 12:01:09 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-06-26 12:01:09 +0200 |
| commit | ba092a5602abba8b1a4bd17988dee6b567f02b7a (patch) | |
| tree | e7addffc79f6871c4d93338064f08a0347692047 /src/CudaCglsAlgorithm3D.cpp | |
| parent | 62f3aa5792011792db866ce0841c8d164aa9a34d (diff) | |
| parent | 233331b4a192c0149f58af1d4c89526260cd3a58 (diff) | |
| download | astra-ba092a5602abba8b1a4bd17988dee6b567f02b7a.tar.gz astra-ba092a5602abba8b1a4bd17988dee6b567f02b7a.tar.bz2 astra-ba092a5602abba8b1a4bd17988dee6b567f02b7a.tar.xz astra-ba092a5602abba8b1a4bd17988dee6b567f02b7a.zip | |
Merge pull request #75 from wjp/cuda_options
Move supersampling options from Algorithm to CudaProjector
Diffstat (limited to 'src/CudaCglsAlgorithm3D.cpp')
| -rw-r--r-- | src/CudaCglsAlgorithm3D.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp index 3457b81..f527dc5 100644 --- a/src/CudaCglsAlgorithm3D.cpp +++ b/src/CudaCglsAlgorithm3D.cpp @@ -32,6 +32,7 @@ $Id$ #include "astra/AstraObjectManager.h" +#include "astra/CudaProjector3D.h" #include "astra/ConeProjectionGeometry3D.h" #include "astra/ParallelVecProjectionGeometry3D.h" #include "astra/ConeVecProjectionGeometry3D.h" @@ -106,12 +107,27 @@ bool CCudaCglsAlgorithm3D::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_iDetectorSuperSampling = (int)_cfg.self.getOptionNumerical("DetectorSuperSampling", 1); - CC.markOptionParsed("DetectorSuperSampling"); - m_iVoxelSuperSampling = (int)_cfg.self.getOptionNumerical("VoxelSuperSampling", 1); + + m_iVoxelSuperSampling = 1; + m_iDetectorSuperSampling = 1; + if (pCudaProjector) { + // New interface + m_iVoxelSuperSampling = pCudaProjector->getVoxelSuperSampling(); + m_iDetectorSuperSampling = pCudaProjector->getDetectorSuperSampling(); + } + // Deprecated options + m_iVoxelSuperSampling = (int)_cfg.self.getOptionNumerical("VoxelSuperSampling", m_iVoxelSuperSampling); + m_iDetectorSuperSampling = (int)_cfg.self.getOptionNumerical("DetectorSuperSampling", m_iDetectorSuperSampling); CC.markOptionParsed("VoxelSuperSampling"); + CC.markOptionParsed("DetectorSuperSampling"); m_pCgls = new AstraCGLS3d(); |