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/ParallelBeamBlobKernelProjector2D.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/ParallelBeamBlobKernelProjector2D.cpp')
-rw-r--r-- | src/ParallelBeamBlobKernelProjector2D.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp index 3253f88..4559a48 100644 --- a/src/ParallelBeamBlobKernelProjector2D.cpp +++ b/src/ParallelBeamBlobKernelProjector2D.cpp @@ -128,28 +128,28 @@ bool CParallelBeamBlobKernelProjector2D::initialize(const Config& _cfg) } // required: Kernel - XMLNode* node = _cfg.self->getSingleNode("Kernel"); + XMLNode node = _cfg.self.getSingleNode("Kernel"); ASTRA_CONFIG_CHECK(node, "BlobProjector", "No Kernel tag specified."); { // Required: KernelSize - XMLNode* node2 = node->getSingleNode("KernelSize"); + XMLNode node2 = node.getSingleNode("KernelSize"); ASTRA_CONFIG_CHECK(node2, "BlobProjector", "No Kernel/KernelSize tag specified."); - m_fBlobSize = boost::lexical_cast<float32>(node2->getContent()); + m_fBlobSize = boost::lexical_cast<float32>(node2.getContent()); // Required: SampleRate - node2 = node->getSingleNode("SampleRate"); + node2 = node.getSingleNode("SampleRate"); ASTRA_CONFIG_CHECK(node2, "BlobProjector", "No Kernel/SampleRate tag specified."); - m_fBlobSampleRate = boost::lexical_cast<float32>(node2->getContent()); + m_fBlobSampleRate = boost::lexical_cast<float32>(node2.getContent()); // Required: SampleCount - node2 = node->getSingleNode("SampleCount"); + node2 = node.getSingleNode("SampleCount"); ASTRA_CONFIG_CHECK(node2, "BlobProjector", "No Kernel/SampleCount tag specified."); - m_iBlobSampleCount = boost::lexical_cast<int>(node2->getContent()); + m_iBlobSampleCount = boost::lexical_cast<int>(node2.getContent()); // Required: KernelValues - node2 = node->getSingleNode("KernelValues"); + node2 = node.getSingleNode("KernelValues"); ASTRA_CONFIG_CHECK(node2, "BlobProjector", "No Kernel/KernelValues tag specified."); - vector<float32> values = node2->getContentNumericalArray(); + vector<float32> values = node2.getContentNumericalArray(); ASTRA_CONFIG_CHECK(values.size() == (unsigned int)m_iBlobSampleCount, "BlobProjector", "Number of specified values doesn't match SampleCount."); m_pfBlobValues = new float32[m_iBlobSampleCount]; for (int i = 0; i < m_iBlobSampleCount; i++) { @@ -157,9 +157,9 @@ bool CParallelBeamBlobKernelProjector2D::initialize(const Config& _cfg) } // Required: KernelValues - node2 = node->getSingleNode("KernelValuesNeg"); + node2 = node.getSingleNode("KernelValuesNeg"); ASTRA_CONFIG_CHECK(node2, "BlobProjector", "No Kernel/KernelValuesNeg tag specified."); - vector<float32> values2 = node2->getContentNumericalArray(); + vector<float32> values2 = node2.getContentNumericalArray(); ASTRA_CONFIG_CHECK(values2.size() == (unsigned int)m_iBlobSampleCount, "BlobProjector", "Number of specified values doesn't match SampleCount."); m_pfBlobValuesNeg = new float32[m_iBlobSampleCount]; for (int i = 0; i < m_iBlobSampleCount; i++) { |