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/CudaForwardProjectionAlgorithm3D.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/CudaForwardProjectionAlgorithm3D.cpp')
| -rw-r--r-- | src/CudaForwardProjectionAlgorithm3D.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/CudaForwardProjectionAlgorithm3D.cpp b/src/CudaForwardProjectionAlgorithm3D.cpp index e29b5a9..46dab12 100644 --- a/src/CudaForwardProjectionAlgorithm3D.cpp +++ b/src/CudaForwardProjectionAlgorithm3D.cpp @@ -97,18 +97,28 @@ bool CCudaForwardProjectionAlgorithm3D::initialize(const Config& _cfg) // optional: projector node = _cfg.self.getSingleNode("ProjectorId"); + CCudaProjector3D* pCudaProjector = 0; + m_pProjector = 0; if (node) { id = boost::lexical_cast<int>(node.getContent()); m_pProjector = CProjector3DManager::getSingleton().get(id); - } else { - m_pProjector = 0; // TODO: or manually construct default projector? + pCudaProjector = dynamic_cast<CCudaProjector3D*>(CProjector3DManager::getSingleton().get(id)); + m_pProjector = pCudaProjector; + if (!pCudaProjector) { + // TODO: Report + } } CC.markNodeParsed("ProjectorId"); // GPU number m_iGPUIndex = (int)_cfg.self.getOptionNumerical("GPUindex", -1); CC.markOptionParsed("GPUindex"); - m_iDetectorSuperSampling = (int)_cfg.self.getOptionNumerical("DetectorSuperSampling", 1); + + + m_iDetectorSuperSampling = 1; + if (pCudaProjector) + m_iDetectorSuperSampling = pCudaProjector->getDetectorSuperSampling(); + m_iDetectorSuperSampling = (int)_cfg.self.getOptionNumerical("DetectorSuperSampling", m_iDetectorSuperSampling); CC.markOptionParsed("DetectorSuperSampling"); // success |