From a452bc6f1c450a7174ec257d052dfe3ce25b1623 Mon Sep 17 00:00:00 2001
From: Wim van Aarle <wimvanaarle@gmail.com>
Date: Tue, 3 Mar 2015 18:22:23 +0100
Subject: created parallel_vec geometry class

---
 include/astra/GeometryUtil2D.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'include/astra/GeometryUtil2D.h')

diff --git a/include/astra/GeometryUtil2D.h b/include/astra/GeometryUtil2D.h
index d4ee92e..680cecd 100644
--- a/include/astra/GeometryUtil2D.h
+++ b/include/astra/GeometryUtil2D.h
@@ -31,6 +31,18 @@ $Id$
 
 namespace astra {
 
+struct SParProjection {
+    // the ray direction
+    float fRayX, fRayY;
+
+    // the start of the (linear) detector
+    float fDetSX, fDetSY;
+
+    // the length of a single detector pixel
+    float fDetUX, fDetUY;
+};
+
+
 struct SFanProjection {
         // the source
         float fSrcX, fSrcY;
-- 
cgit v1.2.3


From b1ffc11d930c19bd73af9837a08bc8dde9fe8e72 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 29 Jul 2016 12:03:38 +0200
Subject: Add CUDA parvec support

---
 include/astra/GeometryUtil2D.h | 73 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 14 deletions(-)

(limited to 'include/astra/GeometryUtil2D.h')

diff --git a/include/astra/GeometryUtil2D.h b/include/astra/GeometryUtil2D.h
index 680cecd..2f03062 100644
--- a/include/astra/GeometryUtil2D.h
+++ b/include/astra/GeometryUtil2D.h
@@ -32,27 +32,72 @@ $Id$
 namespace astra {
 
 struct SParProjection {
-    // the ray direction
-    float fRayX, fRayY;
+	// the ray direction
+	float fRayX, fRayY;
+
+	// the start of the (linear) detector
+	float fDetSX, fDetSY;
+
+	// the length of a single detector pixel
+	float fDetUX, fDetUY;
+
+
+	void translate(double dx, double dy) {
+		fDetSX += dx;
+		fDetSY += dy;
+	}
+	void scale(double factor) {
+		fRayX *= factor;
+		fRayY *= factor;
+		fDetSX *= factor;
+		fDetSY *= factor;
+		fDetUX *= factor;
+		fDetUY *= factor;
+	}
+};
 
-    // the start of the (linear) detector
-    float fDetSX, fDetSY;
 
-    // the length of a single detector pixel
-    float fDetUX, fDetUY;
+struct SFanProjection {
+	// the source
+	float fSrcX, fSrcY;
+
+	// the start of the (linear) detector
+	float fDetSX, fDetSY;
+
+	// the length of a single detector pixel
+	float fDetUX, fDetUY;
+
+	void translate(double dx, double dy) {
+		fSrcX += dx;
+		fSrcY += dy;
+		fDetSX += dx;
+		fDetSY += dy;
+	}
+	void scale(double factor) {
+		fSrcX *= factor;
+		fSrcY *= factor;
+		fDetSX *= factor;
+		fDetSY *= factor;
+		fDetUX *= factor;
+		fDetUY *= factor;
+	}
 };
 
 
-struct SFanProjection {
-        // the source
-        float fSrcX, fSrcY;
 
-        // the start of the (linear) detector
-        float fDetSX, fDetSY;
+SParProjection* genParProjections(unsigned int iProjAngles,
+                                  unsigned int iProjDets,
+                                  double fDetSize,
+                                  const float *pfAngles,
+                                  const float *pfExtraOffsets);
 
-        // the length of a single detector pixel
-        float fDetUX, fDetUY;
-};
+SFanProjection* genFanProjections(unsigned int iProjAngles,
+                                  unsigned int iProjDets,
+                                  double fOriginSource, double fOriginDetector,
+                                  double fDetSize,
+                                  const float *pfAngles);
+
+bool getFanParameters(const SFanProjection &proj, unsigned int iProjDets, float &fAngle, float &fOriginSource, float &fOriginDetector, float &fDetSize, float &fOffset);
 
 }
 
-- 
cgit v1.2.3


From 1a8243ed0311c3074a79b97e1730bf3409774b8d Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 27 Sep 2017 13:57:04 +0200
Subject: Unify some parallel_vec parameter computations

---
 include/astra/GeometryUtil2D.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include/astra/GeometryUtil2D.h')

diff --git a/include/astra/GeometryUtil2D.h b/include/astra/GeometryUtil2D.h
index 4d79353..914e40d 100644
--- a/include/astra/GeometryUtil2D.h
+++ b/include/astra/GeometryUtil2D.h
@@ -96,8 +96,11 @@ SFanProjection* genFanProjections(unsigned int iProjAngles,
                                   double fDetSize,
                                   const float *pfAngles);
 
+bool getParParameters(const SParProjection &proj, unsigned int iProjDets, float &fAngle, float &fDetSize, float &fOffset);
+
 bool getFanParameters(const SFanProjection &proj, unsigned int iProjDets, float &fAngle, float &fOriginSource, float &fOriginDetector, float &fDetSize, float &fOffset);
 
+
 }
 
 #endif
-- 
cgit v1.2.3