diff options
| author | Wim van Aarle <wimvanaarle@gmail.com> | 2015-03-18 11:09:32 +0100 |
|---|---|---|
| committer | Wim van Aarle <wimvanaarle@gmail.com> | 2015-03-18 11:09:32 +0100 |
| commit | 9e884e760b71be354c08892f6bce2efe723917b3 (patch) | |
| tree | d848407729473948695c01f848cecb3375e2cd26 /src | |
| parent | fb01aaf4cd4e7f22308e07bd94dcfc97083e8ec8 (diff) | |
| download | astra-9e884e760b71be354c08892f6bce2efe723917b3.tar.gz astra-9e884e760b71be354c08892f6bce2efe723917b3.tar.bz2 astra-9e884e760b71be354c08892f6bce2efe723917b3.tar.xz astra-9e884e760b71be354c08892f6bce2efe723917b3.zip | |
corrected geometry names
Diffstat (limited to 'src')
| -rw-r--r-- | src/ConeVecProjectionGeometry3D.cpp | 8 | ||||
| -rw-r--r-- | src/ParallelVecProjectionGeometry3D.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp index a4bd22d..9dc273d 100644 --- a/src/ConeVecProjectionGeometry3D.cpp +++ b/src/ConeVecProjectionGeometry3D.cpp @@ -208,7 +208,7 @@ Config* CConeVecProjectionGeometry3D::getConfiguration() const Config* cfg = new Config(); cfg->initialize("ProjectionGeometry3D"); - cfg->self->addAttribute("type", "cone"); + cfg->self->addAttribute("type", "cone_vec"); cfg->self->addChildNode("DetectorRowCount", m_iDetectorRowCount); cfg->self->addChildNode("DetectorColCount", m_iDetectorColCount); @@ -218,9 +218,9 @@ Config* CConeVecProjectionGeometry3D::getConfiguration() const vectors += boost::lexical_cast<string>(p.fSrcX) + ","; vectors += boost::lexical_cast<string>(p.fSrcY) + ","; vectors += boost::lexical_cast<string>(p.fSrcZ) + ","; - vectors += boost::lexical_cast<string>(p.fDetSX + 0.5f*m_iDetectorRowCount*p.fDetUX + 0.5f*m_iDetectorColCount*p.fDetVX) + ","; - vectors += boost::lexical_cast<string>(p.fDetSY + 0.5f*m_iDetectorRowCount*p.fDetUY + 0.5f*m_iDetectorColCount*p.fDetVY) + ","; - vectors += boost::lexical_cast<string>(p.fDetSZ + 0.5f*m_iDetectorRowCount*p.fDetUZ + 0.5f*m_iDetectorColCount*p.fDetVZ) + ","; + vectors += boost::lexical_cast<string>(p.fDetSX + 0.5f*m_iDetectorRowCount*p.fDetVX + 0.5f*m_iDetectorColCount*p.fDetUX) + ","; + vectors += boost::lexical_cast<string>(p.fDetSY + 0.5f*m_iDetectorRowCount*p.fDetVY + 0.5f*m_iDetectorColCount*p.fDetUY) + ","; + vectors += boost::lexical_cast<string>(p.fDetSZ + 0.5f*m_iDetectorRowCount*p.fDetVZ + 0.5f*m_iDetectorColCount*p.fDetUZ) + ","; vectors += boost::lexical_cast<string>(p.fDetUX) + ","; vectors += boost::lexical_cast<string>(p.fDetUY) + ","; vectors += boost::lexical_cast<string>(p.fDetUZ) + ","; diff --git a/src/ParallelVecProjectionGeometry3D.cpp b/src/ParallelVecProjectionGeometry3D.cpp index cfac485..dc325e9 100644 --- a/src/ParallelVecProjectionGeometry3D.cpp +++ b/src/ParallelVecProjectionGeometry3D.cpp @@ -208,7 +208,7 @@ Config* CParallelVecProjectionGeometry3D::getConfiguration() const Config* cfg = new Config(); cfg->initialize("ProjectionGeometry3D"); - cfg->self->addAttribute("type", "parallel3d"); + cfg->self->addAttribute("type", "parallel3d_vec"); cfg->self->addChildNode("DetectorRowCount", m_iDetectorRowCount); cfg->self->addChildNode("DetectorColCount", m_iDetectorColCount); @@ -218,9 +218,9 @@ Config* CParallelVecProjectionGeometry3D::getConfiguration() const vectors += boost::lexical_cast<string>(p.fRayX) + ","; vectors += boost::lexical_cast<string>(p.fRayY) + ","; vectors += boost::lexical_cast<string>(p.fRayZ) + ","; - vectors += boost::lexical_cast<string>(p.fDetSX + 0.5f*m_iDetectorRowCount*p.fDetUX + 0.5f*m_iDetectorColCount*p.fDetVX) + ","; - vectors += boost::lexical_cast<string>(p.fDetSY + 0.5f*m_iDetectorRowCount*p.fDetUY + 0.5f*m_iDetectorColCount*p.fDetVY) + ","; - vectors += boost::lexical_cast<string>(p.fDetSZ + 0.5f*m_iDetectorRowCount*p.fDetUZ + 0.5f*m_iDetectorColCount*p.fDetVZ) + ","; + vectors += boost::lexical_cast<string>(p.fDetSX + 0.5f*m_iDetectorRowCount*p.fDetVX + 0.5f*m_iDetectorColCount*p.fDetUX) + ","; + vectors += boost::lexical_cast<string>(p.fDetSY + 0.5f*m_iDetectorRowCount*p.fDetVY + 0.5f*m_iDetectorColCount*p.fDetUY) + ","; + vectors += boost::lexical_cast<string>(p.fDetSZ + 0.5f*m_iDetectorRowCount*p.fDetVZ + 0.5f*m_iDetectorColCount*p.fDetUZ) + ","; vectors += boost::lexical_cast<string>(p.fDetUX) + ","; vectors += boost::lexical_cast<string>(p.fDetUY) + ","; vectors += boost::lexical_cast<string>(p.fDetUZ) + ","; |