summaryrefslogtreecommitdiffstats
path: root/include/astra/ProjectionGeometry3D.h
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2014-12-01 11:53:07 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-01-19 11:16:23 +0100
commit44442e9e3212d0f4f72e41bc94e935d0b2dd7033 (patch)
tree069e14ef26c543d21030cf9b0e68dd0597beae12 /include/astra/ProjectionGeometry3D.h
parent3eb6f61e48f7ab6ddaa0e78d9140a4322dbb92fb (diff)
downloadastra-44442e9e3212d0f4f72e41bc94e935d0b2dd7033.tar.gz
astra-44442e9e3212d0f4f72e41bc94e935d0b2dd7033.tar.bz2
astra-44442e9e3212d0f4f72e41bc94e935d0b2dd7033.tar.xz
astra-44442e9e3212d0f4f72e41bc94e935d0b2dd7033.zip
Remove unused DetectorOffsetX/Y in ProjectionGeometry3D
Diffstat (limited to 'include/astra/ProjectionGeometry3D.h')
-rw-r--r--include/astra/ProjectionGeometry3D.h64
1 files changed, 2 insertions, 62 deletions
diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h
index 99c5a2f..18f7e41 100644
--- a/include/astra/ProjectionGeometry3D.h
+++ b/include/astra/ProjectionGeometry3D.h
@@ -92,12 +92,6 @@ protected:
*/
float32* m_pfProjectionAngles;
- /** Dynamically allocated array of vectors that represents the amount by which an image has been shifted after
- * projection. Each projection image has a 2 shifts associated with it, one x-translation and y-translation
- */
- float32* m_pfExtraDetectorOffsetsX;
- float32* m_pfExtraDetectorOffsetsY;
-
/** Default constructor. Sets all numeric member variables to 0 and all pointer member variables to NULL.
*
* If an object is constructed using this default constructor, it must always be followed by a call
@@ -122,9 +116,7 @@ protected:
int _iDetectorColCount,
float32 _fDetectorSpacingX,
float32 _fDetectorSpacingY,
- const float32* _pfProjectionAngles,
- const float32* _pfExtraDetectorOffsetsX = NULL,
- const float32* _pfExtraDetectorOffsetsY = NULL);
+ const float32* _pfProjectionAngles);
/** Copy constructor.
*/
@@ -160,9 +152,7 @@ protected:
int _iDetectorColCount,
float32 _fDetectorSpacingX,
float32 _fDetectorSpacingY,
- const float32* _pfProjectionAngles,
- const float32* _pfExtraDetectorOffsetsX = NULL,
- const float32* _pfExtraDetectorOffsetsY = NULL);
+ const float32* _pfProjectionAngles);
public:
@@ -254,18 +244,6 @@ public:
*/
const float32* getProjectionAngles() const;
- const float32* getExtraDetectorOffsetsX() const;
-
- const float32* getExtraDetectorOffsetsY() const;
-
- float32 getExtraDetectorOffsetX(int _iProjectionIndex) const;
-
- float32 getExtraDetectorOffsetY(int _iProjectionIndex) const;
-
- AstraError setExtraDetectorOffsetsX(float32* _pfExtraDetectorOffsetsX);
-
- AstraError setExtraDetectorOffsetsY(float32* _pfExtraDetectorOffsetsY);
-
/** Get the column index coordinate of a point on a detector array.
*
* @param _fOffsetX Distance between the center of the detector array and a certain point (both on the X-axis).
@@ -445,44 +423,6 @@ inline const float32* CProjectionGeometry3D::getProjectionAngles() const
//----------------------------------------------------------------------------------------
-// Get pointer to buffer used to store x-translations of the projection images.
-inline const float32* CProjectionGeometry3D::getExtraDetectorOffsetsX() const
-{
- // basic checks
- ASTRA_ASSERT(m_bInitialized);
-
- return m_pfExtraDetectorOffsetsX;
-}
-
-//----------------------------------------------------------------------------------------
-// Get pointer to buffer used to store y-translations of the projection images.
-inline const float32* CProjectionGeometry3D::getExtraDetectorOffsetsY() const
-{
- // basic checks
- ASTRA_ASSERT(m_bInitialized);
-
- return m_pfExtraDetectorOffsetsY;
-}
-//----------------------------------------------------------------------------------------
-// Get the x-translation of a specific projection image.
-inline float32 CProjectionGeometry3D::getExtraDetectorOffsetX(int _iProjectionIndex) const
-{
- // basic checks
- ASTRA_ASSERT(m_bInitialized);
-
- return m_pfExtraDetectorOffsetsX[_iProjectionIndex];
-}
-
-//----------------------------------------------------------------------------------------
-// Get the y-translation of a specific projection image.
-inline float32 CProjectionGeometry3D::getExtraDetectorOffsetY(int _iProjectionIndex) const
-{
- // basic checks
- ASTRA_ASSERT(m_bInitialized);
-
- return m_pfExtraDetectorOffsetsX[_iProjectionIndex];
-}
-//----------------------------------------------------------------------------------------
// detector offset X -> detector column index (float)
inline float32 CProjectionGeometry3D::detectorOffsetXToColIndexFloat(float32 _fOffsetX) const
{