diff options
| author | Wim van Aarle <wimvanaarle@gmail.com> | 2015-05-26 15:43:08 +0200 |
|---|---|---|
| committer | Wim van Aarle <wimvanaarle@gmail.com> | 2015-05-26 15:43:08 +0200 |
| commit | 3117c7a61a83ca28ba00211d1eb65eaf13a7307a (patch) | |
| tree | 4851ae878cf499deb2ae2f77575b3c48ecaf5d04 /src/Projector3D.cpp | |
| parent | 9e884e760b71be354c08892f6bce2efe723917b3 (diff) | |
| parent | 57668bcdd086145eb14598e32fd5d0dca711865c (diff) | |
| download | astra-3117c7a61a83ca28ba00211d1eb65eaf13a7307a.tar.gz astra-3117c7a61a83ca28ba00211d1eb65eaf13a7307a.tar.bz2 astra-3117c7a61a83ca28ba00211d1eb65eaf13a7307a.tar.xz astra-3117c7a61a83ca28ba00211d1eb65eaf13a7307a.zip | |
Merge remote-tracking branch 'upstream/master' into parallel_vec
Conflicts:
astra_vc11.vcxproj.filters
python/astra/functions.py
src/ParallelBeamBlobKernelProjector2D.cpp
src/ProjectionGeometry2D.cpp
Diffstat (limited to 'src/Projector3D.cpp')
| -rw-r--r-- | src/Projector3D.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Projector3D.cpp b/src/Projector3D.cpp index b546ee9..5e22105 100644 --- a/src/Projector3D.cpp +++ b/src/Projector3D.cpp @@ -92,11 +92,11 @@ bool CProjector3D::initialize(const Config& _cfg) assert(_cfg.self); ConfigStackCheck<CProjector3D> CC("Projector3D", this, _cfg); - XMLNode* node; + XMLNode node; - node = _cfg.self->getSingleNode("ProjectionGeometry"); + node = _cfg.self.getSingleNode("ProjectionGeometry"); ASTRA_CONFIG_CHECK(node, "Projector3D", "No ProjectionGeometry tag specified."); - std::string type = node->getAttribute("type"); + std::string type = node.getAttribute("type"); CProjectionGeometry3D* pProjGeometry = 0; if (type == "parallel3d") { pProjGeometry = new CParallelProjectionGeometry3D(); @@ -108,18 +108,19 @@ bool CProjector3D::initialize(const Config& _cfg) pProjGeometry = new CConeVecProjectionGeometry3D(); } else { // Invalid geometry type + ASTRA_CONFIG_CHECK(false, "Projector3D", "Invalid projection geometry type specified."); } pProjGeometry->initialize(Config(node)); // this deletes node m_pProjectionGeometry = pProjGeometry; ASTRA_CONFIG_CHECK(m_pProjectionGeometry->isInitialized(), "Projector3D", "ProjectionGeometry not initialized."); CC.markNodeParsed("ProjectionGeometry"); - node = _cfg.self->getSingleNode("VolumeGeometry"); + node = _cfg.self.getSingleNode("VolumeGeometry"); ASTRA_CONFIG_CHECK(node, "Projector3D", "No VolumeGeometry tag specified."); CVolumeGeometry3D* pVolGeometry = new CVolumeGeometry3D(); pVolGeometry->initialize(Config(node)); // this deletes node m_pVolumeGeometry = pVolGeometry; - ASTRA_CONFIG_CHECK(m_pVolumeGeometry->isInitialized(), "Projector2D", "VolumeGeometry not initialized."); + ASTRA_CONFIG_CHECK(m_pVolumeGeometry->isInitialized(), "Projector3D", "VolumeGeometry not initialized."); CC.markNodeParsed("VolumeGeometry"); return true; |