summaryrefslogtreecommitdiffstats
path: root/src/ReconstructionAlgorithm3D.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-05-26 15:36:42 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-06-04 17:24:20 +0200
commit0985154228a63db25e9a0a0165994221d9b97a91 (patch)
treeca5c090b9c2cd320dc1598abb66198f198e8ce46 /src/ReconstructionAlgorithm3D.cpp
parent167ec3f4e1cbe4eb856474cb515291261955b053 (diff)
downloadastra-0985154228a63db25e9a0a0165994221d9b97a91.tar.gz
astra-0985154228a63db25e9a0a0165994221d9b97a91.tar.bz2
astra-0985154228a63db25e9a0a0165994221d9b97a91.tar.xz
astra-0985154228a63db25e9a0a0165994221d9b97a91.zip
Use supersampling options from CudaProjector3D
Diffstat (limited to 'src/ReconstructionAlgorithm3D.cpp')
-rw-r--r--src/ReconstructionAlgorithm3D.cpp18
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");