diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-05-13 11:56:24 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-05-13 11:56:24 +0200 |
| commit | de30f7538a865a2ee7acb7dd8294fb6cdc4f98be (patch) | |
| tree | ba11189e6e83e83e73167518b45641fc287c8eda /src/ForwardProjectionAlgorithm.cpp | |
| parent | 6504cffdbe74d9b671222a7ec24b26fbb4f871f0 (diff) | |
| parent | 86ad56f005d9d3871f654390739459d5634dd5d5 (diff) | |
| download | astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.gz astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.bz2 astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.xz astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.zip | |
Merge branch 'master'
Diffstat (limited to 'src/ForwardProjectionAlgorithm.cpp')
| -rw-r--r-- | src/ForwardProjectionAlgorithm.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/ForwardProjectionAlgorithm.cpp b/src/ForwardProjectionAlgorithm.cpp index b530491..f356824 100644 --- a/src/ForwardProjectionAlgorithm.cpp +++ b/src/ForwardProjectionAlgorithm.cpp @@ -126,37 +126,34 @@ bool CForwardProjectionAlgorithm::initialize(const Config& _cfg) } // projector - XMLNode* node = _cfg.self->getSingleNode("ProjectorId"); + XMLNode node = _cfg.self.getSingleNode("ProjectorId"); ASTRA_CONFIG_CHECK(node, "ForwardProjection", "No ProjectorId tag specified."); - int id = boost::lexical_cast<int>(node->getContent()); + int id = boost::lexical_cast<int>(node.getContent()); m_pProjector = CProjector2DManager::getSingleton().get(id); - ASTRA_DELETE(node); // sinogram data - node = _cfg.self->getSingleNode("ProjectionDataId"); + node = _cfg.self.getSingleNode("ProjectionDataId"); ASTRA_CONFIG_CHECK(node, "ForwardProjection", "No ProjectionDataId tag specified."); - id = boost::lexical_cast<int>(node->getContent()); + id = boost::lexical_cast<int>(node.getContent()); m_pSinogram = dynamic_cast<CFloat32ProjectionData2D*>(CData2DManager::getSingleton().get(id)); - ASTRA_DELETE(node); // volume data - node = _cfg.self->getSingleNode("VolumeDataId"); + node = _cfg.self.getSingleNode("VolumeDataId"); ASTRA_CONFIG_CHECK(node, "ForwardProjection", "No VolumeDataId tag specified."); - id = boost::lexical_cast<int>(node->getContent()); + id = boost::lexical_cast<int>(node.getContent()); m_pVolume = dynamic_cast<CFloat32VolumeData2D*>(CData2DManager::getSingleton().get(id)); - ASTRA_DELETE(node); // volume mask - if (_cfg.self->hasOption("VolumeMaskId")) { + if (_cfg.self.hasOption("VolumeMaskId")) { m_bUseVolumeMask = true; - id = boost::lexical_cast<int>(_cfg.self->getOption("VolumeMaskId")); + id = boost::lexical_cast<int>(_cfg.self.getOption("VolumeMaskId")); m_pVolumeMask = dynamic_cast<CFloat32VolumeData2D*>(CData2DManager::getSingleton().get(id)); } // sino mask - if (_cfg.self->hasOption("SinogramMaskId")) { + if (_cfg.self.hasOption("SinogramMaskId")) { m_bUseSinogramMask = true; - id = boost::lexical_cast<int>(_cfg.self->getOption("SinogramMaskId")); + id = boost::lexical_cast<int>(_cfg.self.getOption("SinogramMaskId")); m_pSinogramMask = dynamic_cast<CFloat32ProjectionData2D*>(CData2DManager::getSingleton().get(id)); } |