diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-05-08 14:12:53 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-05-08 14:12:53 +0200 |
| commit | 99f46882982b92c632869053ae0dd416312b02ff (patch) | |
| tree | 539252314daa42411d053e926134b289a750f14c /src/CudaDartMaskAlgorithm.cpp | |
| parent | 63307fca7a82bfea7592d9c8d3a359333e622495 (diff) | |
| parent | fff7470f1d74b0085355130350fa834ea8d37069 (diff) | |
| download | astra-99f46882982b92c632869053ae0dd416312b02ff.tar.gz astra-99f46882982b92c632869053ae0dd416312b02ff.tar.bz2 astra-99f46882982b92c632869053ae0dd416312b02ff.tar.xz astra-99f46882982b92c632869053ae0dd416312b02ff.zip | |
Merge pull request #61 from wjp/xmlnode_cleanup
Clean up XMLNode
Diffstat (limited to 'src/CudaDartMaskAlgorithm.cpp')
| -rw-r--r-- | src/CudaDartMaskAlgorithm.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/CudaDartMaskAlgorithm.cpp b/src/CudaDartMaskAlgorithm.cpp index dcdefcc..950b428 100644 --- a/src/CudaDartMaskAlgorithm.cpp +++ b/src/CudaDartMaskAlgorithm.cpp @@ -65,38 +65,36 @@ bool CCudaDartMaskAlgorithm::initialize(const Config& _cfg) ConfigStackCheck<CAlgorithm> CC("CudaDartMaskAlgorithm", this, _cfg); // reconstruction data - XMLNode* node = _cfg.self->getSingleNode("SegmentationDataId"); + XMLNode node = _cfg.self.getSingleNode("SegmentationDataId"); ASTRA_CONFIG_CHECK(node, "CudaDartMask", "No SegmentationDataId tag specified."); - int id = boost::lexical_cast<int>(node->getContent()); + int id = boost::lexical_cast<int>(node.getContent()); m_pSegmentation = dynamic_cast<CFloat32VolumeData2D*>(CData2DManager::getSingleton().get(id)); - ASTRA_DELETE(node); CC.markNodeParsed("SegmentationDataId"); // reconstruction data - node = _cfg.self->getSingleNode("MaskDataId"); + node = _cfg.self.getSingleNode("MaskDataId"); ASTRA_CONFIG_CHECK(node, "CudaDartMask", "No MaskDataId tag specified."); - id = boost::lexical_cast<int>(node->getContent()); + id = boost::lexical_cast<int>(node.getContent()); m_pMask = dynamic_cast<CFloat32VolumeData2D*>(CData2DManager::getSingleton().get(id)); - ASTRA_DELETE(node); CC.markNodeParsed("MaskDataId"); // Option: GPU number - m_iGPUIndex = (int)_cfg.self->getOptionNumerical("GPUindex", -1); - m_iGPUIndex = (int)_cfg.self->getOptionNumerical("GPUIndex", m_iGPUIndex); + m_iGPUIndex = (int)_cfg.self.getOptionNumerical("GPUindex", -1); + m_iGPUIndex = (int)_cfg.self.getOptionNumerical("GPUIndex", m_iGPUIndex); CC.markOptionParsed("GPUindex"); - if (!_cfg.self->hasOption("GPUindex")) + if (!_cfg.self.hasOption("GPUindex")) CC.markOptionParsed("GPUIndex"); // Option: Connectivity - m_iConn = (unsigned int)_cfg.self->getOptionNumerical("Connectivity", 8); + m_iConn = (unsigned int)_cfg.self.getOptionNumerical("Connectivity", 8); CC.markOptionParsed("Connectivity"); // Option: Threshold - m_iThreshold = (unsigned int)_cfg.self->getOptionNumerical("Threshold", 1); + m_iThreshold = (unsigned int)_cfg.self.getOptionNumerical("Threshold", 1); CC.markOptionParsed("Threshold"); // Option: Radius - m_iRadius = (unsigned int)_cfg.self->getOptionNumerical("Radius", 1); + m_iRadius = (unsigned int)_cfg.self.getOptionNumerical("Radius", 1); CC.markOptionParsed("Radius"); _check(); |