r10902: Automated commit for Debian build of ctsim upstream-version-4.4.4

[ctsim.git] / include / backprojectors.h

diff --git a/include/backprojectors.h b/include/backprojectors.h
index 0a0cb1275dfdd8034db2b30df0d8c4a73d562c9c..f34964cf7ec9257c0b37c3b81d262b089450cd41 100644 (file)
--- a/include/backprojectors.h
+++ b/include/backprojectors.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: backprojectors.h,v 1.24 2001/03/01 07:30:49 kevin Exp $
+**  $Id$
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -37,6 +37,7 @@
 class Backproject;
 class ImageFile;
 class Projections;
+struct ReconstructionROI;
 
 class Backprojector
 {
@@ -59,7 +60,8 @@ class Backprojector
   static const int INTERP_3BSPLINE;
 #endif
 
-  Backprojector (const Projections& proj, ImageFile& im, const char* const backprojName, const char* const interpName, const int interpFactor);
+  Backprojector (const Projections& proj, ImageFile& im, const char* const backprojName, 
+    const char* const interpName, const int interpFactor, const ReconstructionROI* pROI);
 
   ~Backprojector ();
                 
@@ -101,14 +103,16 @@ class Backprojector
   static const char* const s_aszInterpTitle[];
   static const int s_iInterpCount;
 
-  bool initBackprojector (const Projections& proj, ImageFile& im, const char* const backprojName, const char* const interpName, const int interpFactor);
+  bool initBackprojector (const Projections& proj, ImageFile& im, const char* const backprojName,
+    const char* const interpName, const int interpFactor, const ReconstructionROI* pROI);
 };
 
 
 class Backproject
 {
  public:
-    Backproject (const Projections& proj, ImageFile& im, int interpID, const int interpFactor);
+    Backproject (const Projections& proj, ImageFile& im, int interpID, const int interpFactor, 
+      const ReconstructionROI* pROI);
 
     virtual ~Backproject ();
 
@@ -117,8 +121,8 @@ class Backproject
 
  protected:
     void ScaleImageByRotIncrement ();
-    void Backproject::errorIndexOutsideDetector (int ix, int iy, double theta, double r, double phi, double L, int ni);
-    void Backproject::errorIndexOutsideDetector (int ix, int iy, double theta, double L, int ni);
+    void errorIndexOutsideDetector (int ix, int iy, double theta, double r, double phi, double L, int ni);
+    void errorIndexOutsideDetector (int ix, int iy, double theta, double L, int ni);
     const Projections& proj;
     ImageFile& im;
     int interpType;
@@ -145,8 +149,8 @@ class Backproject
 class BackprojectTrig : public Backproject
 {
  public:
-  BackprojectTrig (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-      : Backproject (proj, im, interpID, interpFactor)
+  BackprojectTrig (const Projections& proj, ImageFile& im, int interpID, const int interpFactor, const ReconstructionROI* pROI)
+      : Backproject (proj, im, interpID, interpFactor, pROI)
       {}
 
   void BackprojectView (const double* const t, const double view_angle);
@@ -156,7 +160,7 @@ class BackprojectTrig : public Backproject
 class BackprojectTable : public Backproject
 {
  public:
-  BackprojectTable (const Projections& proj, ImageFile& im, int interpID, const int interpFactor);
+  BackprojectTable (const Projections& proj, ImageFile& im, int interpID, const int interpFactor, const ReconstructionROI* pROI);
   virtual ~BackprojectTable ();
 
   virtual void BackprojectView (const double* const t, const double view_angle);
@@ -173,7 +177,7 @@ class BackprojectTable : public Backproject
 class BackprojectDiff : public Backproject
 {
  public:
-  BackprojectDiff (const Projections& proj, ImageFile& im, int interpID, const int interpFactor);
+  BackprojectDiff (const Projections& proj, ImageFile& im, int interpID, const int interpFactor, const ReconstructionROI* pROI);
   ~BackprojectDiff ();
 
   virtual void BackprojectView (const double* const t, const double view_angle);
@@ -189,8 +193,8 @@ class BackprojectDiff : public Backproject
 class BackprojectIntDiff : public BackprojectDiff
 {
  public:
-  BackprojectIntDiff (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-    :  BackprojectDiff (proj, im, interpID, interpFactor)
+  BackprojectIntDiff (const Projections& proj, ImageFile& im, int interpID, const int interpFactor, const ReconstructionROI* pROI)
+    :  BackprojectDiff (proj, im, interpID, interpFactor, pROI)
     {}
   
   void BackprojectView (const double* const t, const double view_angle);
@@ -199,8 +203,8 @@ class BackprojectIntDiff : public BackprojectDiff
 class BackprojectEquilinear : public BackprojectTable
 {
  public:
-  BackprojectEquilinear (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-      : BackprojectTable (proj, im, interpID, interpFactor)
+  BackprojectEquilinear (const Projections& proj, ImageFile& im, int interpID, const int interpFactor,  const ReconstructionROI* pROI)
+      : BackprojectTable (proj, im, interpID, interpFactor, pROI)
       {}
 
   void BackprojectView (const double* const t, const double view_angle);
@@ -212,8 +216,8 @@ class BackprojectEquilinear : public BackprojectTable
 class BackprojectEquiangular : public BackprojectTable
 {
  public:
-  BackprojectEquiangular (const Projections& proj, ImageFile& im, int interpID, const int interpFactor)
-      : BackprojectTable (proj, im, interpID, interpFactor)
+  BackprojectEquiangular (const Projections& proj, ImageFile& im, int interpID, const int interpFactor,  const ReconstructionROI* pROI)
+      : BackprojectTable (proj, im, interpID, interpFactor, pROI)
       {}
 
   void BackprojectView (const double* const t, const double view_angle);