diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/astra/ParallelProjectionGeometry3D.h | 8 | ||||
| -rw-r--r-- | include/astra/ProjectionGeometry3D.h | 64 |
2 files changed, 4 insertions, 68 deletions
diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h index 85d0687..3549984 100644 --- a/include/astra/ParallelProjectionGeometry3D.h +++ b/include/astra/ParallelProjectionGeometry3D.h @@ -84,9 +84,7 @@ public: int _iDetectorColCount, float32 _fDetectorWidth, float32 _fDetectorHeight, - const float32* _pfProjectionAngles, - const float32* _pfExtraDetectorOffsetsX = NULL, - const float32* _pfExtraDetectorOffsetsY = NULL); + const float32* _pfProjectionAngles); /** Copy constructor. */ @@ -119,9 +117,7 @@ public: int _iDetectorColCount, float32 _fDetectorWidth, float32 _fDetectorHeight, - const float32* _pfProjectionAngles, - const float32* _pfExtraDetectorOffsetsX = NULL, - const float32* _pfExtraDetectorOffsetsY = NULL); + const float32* _pfProjectionAngles); /** Create a hard copy. */ diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h index 0deffa6..72a1a55 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 { |