Merge branch 'parallel_vec'

1 files changed, 2 insertions, 17 deletions

diff --git a/include/astra/ProjectionGeometry2D.h b/include/astra/ProjectionGeometry2D.h
index 393db77..504f588 100644
--- a/include/astra/ProjectionGeometry2D.h
+++ b/include/astra/ProjectionGeometry2D.h
@@ -64,10 +64,6 @@ protected:
 	 */
 	float32 m_fDetectorWidth;
 
-	/** An array of m_iProjectionAngleCount elements containing an extra detector offset for each projection.
-	 */
-	float32* m_pfExtraDetectorOffset;
-
 	/** Dynamically allocated array of projection angles. All angles are represented in radians and lie in 
 	 * the [0,2pi[ interval.
 	 */
@@ -93,8 +89,7 @@ protected:
 	CProjectionGeometry2D(int _iProjectionAngleCount, 
 						  int _iDetectorCount, 
 						  float32 _fDetectorWidth, 
-						  const float32* _pfProjectionAngles,
-						  const float32* _pfExtraDetectorOffsets = 0);
+						  const float32* _pfProjectionAngles);
 
 	/** Copy constructor. 
 	 */
@@ -120,8 +115,7 @@ protected:
 	bool _initialize(int _iProjectionAngleCount,
 					 int _iDetectorCount,
 					 float32 _fDetectorWidth,
-					 const float32* _pfProjectionAngles,
-					 const float32* _pfExtraDetectorOffsets = 0);
+					 const float32* _pfProjectionAngles);
 
 public:
 
@@ -201,9 +195,6 @@ public:
 	 */
 	float32 getProjectionAngleDegrees(int _iProjectionIndex) const;
 
-	float32 getExtraDetectorOffset(int iAngle) const;
-	const float32* getExtraDetectorOffset() const { return m_pfExtraDetectorOffset; }
-
 	/** Get the index coordinate of a point on a detector array.
 	 *
 	 * @param _fOffset	distance between the center of the detector array and a certain point
@@ -272,12 +263,6 @@ public:
 //----------------------------------------------------------------------------------------
 
 
-inline float32 CProjectionGeometry2D::getExtraDetectorOffset(int _iAngle) const
-{
-	return m_pfExtraDetectorOffset ? m_pfExtraDetectorOffset[_iAngle] : 0.0f;
-}
-
-
 // Get the initialization state.
 inline bool CProjectionGeometry2D::isInitialized() const
 {