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/CudaForwardProjectionAlgorithm3D.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/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 |