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/ReconstructionAlgorithm3D.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/ReconstructionAlgorithm3D.cpp')
| -rw-r--r-- | src/ReconstructionAlgorithm3D.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/ReconstructionAlgorithm3D.cpp b/src/ReconstructionAlgorithm3D.cpp index 86b8ab2..f975ace 100644 --- a/src/ReconstructionAlgorithm3D.cpp +++ b/src/ReconstructionAlgorithm3D.cpp @@ -106,14 +106,18 @@ bool CReconstructionAlgorithm3D::initialize(const Config& _cfg) XMLNode node; int id; -#if 0 + // projector - node = _cfg.self->getSingleNode("ProjectorId"); - ASTRA_CONFIG_CHECK(node, "Reconstruction3D", "No ProjectorId tag specified."); - id = boost::lexical_cast<int>(node->getContent()); - m_pProjector = CProjector3DManager::getSingleton().get(id); - ASTRA_DELETE(node); -#endif + node = _cfg.self.getSingleNode("ProjectorId"); + m_pProjector = 0; + if (node) { + id = boost::lexical_cast<int>(node.getContent()); + m_pProjector = CProjector3DManager::getSingleton().get(id); + if (!m_pProjector) { + // TODO: Report + } + } + CC.markNodeParsed("ProjectorId"); // sinogram data node = _cfg.self.getSingleNode("ProjectionDataId"); |