X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fbackprojectors.h;h=297d8d156f36fce31c101415027716bf2e631cb3;hp=f0cc19a1d0147ce6da2dab7169f44735418cc2df;hb=3fba6928127cd65870bdcd96c8114ad5894247ae;hpb=6850134e4711a842cc7c0a306a9e4243df06b952

diff --git a/include/backprojectors.h b/include/backprojectors.h
index f0cc19a..297d8d1 100644
--- a/include/backprojectors.h
+++ b/include/backprojectors.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: backprojectors.h,v 1.7 2000/07/09 08:16:17 kevin Exp $
+**  $Id: backprojectors.h,v 1.9 2000/07/13 07:03:21 kevin Exp $
 **
 **  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
@@ -53,7 +53,7 @@ class Backprojector
     I_3BSPLINE,
 #endif
     INTERP_LINEAR,        // Linear interpolation 
-    INTERP_FREQ_PREINTERPOLATE,
+    INTERP_FREQ_PREINTERPOLATION,
   } InterpolationID;
 
   static const char BPROJ_TRIG_STR[]=     "trig";
@@ -66,9 +66,9 @@ class Backprojector
   static const char INTERP_NEAREST_STR[]=  "nearest";
   static const char INTERP_LINEAR_STR[]=   "linear";
   static const char INTERP_BSPLINE_STR[]=  "bspline";
-  static const char INTERP_FREQ_PREINTERPOLATE_STR[]= "freq_preinterpolate";
+  static const char INTERP_FREQ_PREINTERPOLATION_STR[]= "freq_preinterpolation";
 
-  Backprojector (const Projections& proj, ImageFile& im, const char* const backprojName, const char* const interpName);
+  Backprojector (const Projections& proj, ImageFile& im, const char* const backprojName, const char* const interpName, const int interpFactor);
 
   ~Backprojector (void);
 		 
@@ -91,14 +91,14 @@ class Backprojector
   static const BackprojectID convertBackprojectNameToID (const char* const bprojName);
   static const char* convertBackprojectIDToName (const BackprojectID bprojID);
 
-  bool initBackprojector (const Projections& proj, ImageFile& im, const char* const backprojName, const char* const interpName);
+  bool initBackprojector (const Projections& proj, ImageFile& im, const char* const backprojName, const char* const interpName, const int interpFactor);
 };
 
 
 class Backproject
 {
  public:
-    Backproject (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType);
+    Backproject (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType, const int interpFactor);
 
     virtual ~Backproject ();
 
@@ -109,18 +109,19 @@ class Backproject
     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);
 
-    Backprojector::InterpolationID interpType;
     const Projections& proj;
     ImageFile& im;
+    Backprojector::InterpolationID interpType;
     ImageFileArray v;
-    kuint32 nx;
-    kuint32 ny;
+    kint32 nx;
+    kint32 ny;
     double detInc;
     double rotInc;
     int iDetCenter;      	// index refering to L=0 projection 
     int nDet;
     double xMin, xMax, yMin, yMax;     // Retangular coords of phantom
     double xInc, yInc;	// size of cells
+    int m_interpFactor;
 
  private:
     Backproject (const Backproject& rhs);
@@ -131,8 +132,8 @@ class Backproject
 class BackprojectTrig : public Backproject
 {
  public:
-  BackprojectTrig (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType)
-      : Backproject::Backproject (proj, im, interpType)
+  BackprojectTrig (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType, const int interpFactor)
+      : Backproject::Backproject (proj, im, interpType, interpFactor)
       {}
 
   void BackprojectView (const double* const t, double view_angle);
@@ -142,7 +143,7 @@ class BackprojectTrig : public Backproject
 class BackprojectTable : public Backproject
 {
  public:
-  BackprojectTable (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType);
+  BackprojectTable (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType, const int interpFactor);
   ~BackprojectTable ();
 
   void BackprojectView (const double* const t, double view_angle);
@@ -158,7 +159,7 @@ class BackprojectTable : public Backproject
 class BackprojectDiff : public Backproject
 {
  public:
-  BackprojectDiff (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType);
+  BackprojectDiff (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType, const int interpFactor);
   ~BackprojectDiff ();
 
   void BackprojectView (const double* const t, double view_angle);
@@ -172,8 +173,8 @@ class BackprojectDiff : public Backproject
 class BackprojectDiff2 : public BackprojectDiff
 {
  public:
-  BackprojectDiff2 (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType)
-    :  BackprojectDiff::BackprojectDiff (proj, im, interpType)
+  BackprojectDiff2 (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType, const int interpFactor)
+    :  BackprojectDiff::BackprojectDiff (proj, im, interpType, interpFactor)
     {}
 
   void BackprojectView (const double* const t, double view_angle);
@@ -182,8 +183,8 @@ class BackprojectDiff2 : public BackprojectDiff
 class BackprojectIntDiff2 : public BackprojectDiff
 {
  public:
-  BackprojectIntDiff2 (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType)
-    :  BackprojectDiff::BackprojectDiff (proj, im, interpType)
+  BackprojectIntDiff2 (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType, const int interpFactor)
+    :  BackprojectDiff::BackprojectDiff (proj, im, interpType, interpFactor)
     {}
   
   void BackprojectView (const double* const t, double view_angle);
@@ -193,8 +194,8 @@ class BackprojectIntDiff2 : public BackprojectDiff
 class BackprojectIntDiff3 : public BackprojectDiff
 {
  public:
-  BackprojectIntDiff3 (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType)
-    :  BackprojectDiff::BackprojectDiff (proj, im, interpType)
+  BackprojectIntDiff3 (const Projections& proj, ImageFile& im, Backprojector::InterpolationID interpType, const int interpFactor)
+    :  BackprojectDiff::BackprojectDiff (proj, im, interpType, interpFactor)
     {}
   
   void BackprojectView (const double* const t, double view_angle);