r97: Converted Scanner and Projections to C++

[ctsim.git] / include / backprojectors.h

diff --git a/include/backprojectors.h b/include/backprojectors.h
index ea0e85c23e2a3b0af01e6238c0c6b1b18124e262..c28a11b750c4ea15dc6260428650ecc62430061b 100644 (file)
--- a/include/backprojectors.h
+++ b/include/backprojectors.h
@@ -9,8 +9,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: backprojectors.h,v 1.2 2000/06/13 16:20:31 kevin Exp $
+**  $Id: backprojectors.h,v 1.3 2000/06/17 20:12:14 kevin Exp $

 **  $Log: backprojectors.h,v $
 **  $Log: backprojectors.h,v $

+**  Revision 1.3  2000/06/17 20:12:14  kevin
+**  Converted Scanner and Projections to C++
+**

 **  Revision 1.2  2000/06/13 16:20:31  kevin
 **  finished c++ conversions
 **
 **  Revision 1.2  2000/06/13 16:20:31  kevin
 **  finished c++ conversions
 **


@@ -35,7 +38,7 @@
 class Backproject
 {
  public:
 class Backproject
 {
  public:

-    Backproject (const RAYSUM* rs, ImageFile& im, InterpolationType interpType);
+    Backproject (const Projections& proj, ImageFile& im, InterpolationType interpType);

 
     virtual ~Backproject ();
 
 
     virtual ~Backproject ();
 


@@ -47,7 +50,7 @@ class Backproject
     void Backproject::errorIndexOutsideDetector (int ix, int iy, double theta, double L, int ni);
 
     InterpolationType interpType;
     void Backproject::errorIndexOutsideDetector (int ix, int iy, double theta, double L, int ni);
 
     InterpolationType interpType;

-    const RAYSUM* rs;
+    const Projections& proj;

     ImageFile& im;
     ImageFileArray v;
     kuint32 nx;
     ImageFile& im;
     ImageFileArray v;
     kuint32 nx;


@@ -68,8 +71,8 @@ class Backproject
 class BackprojectTrig : public Backproject
 {
  public:
 class BackprojectTrig : public Backproject
 {
  public:

-  BackprojectTrig (const RAYSUM* rs, ImageFile& im, InterpolationType interpType)
-      : Backproject::Backproject (rs, im, interpType)
+  BackprojectTrig (const Projections& proj, ImageFile& im, InterpolationType interpType)
+      : Backproject::Backproject (proj, im, interpType)

       {}
 
   void BackprojectView (const double* const t, double view_angle);
       {}
 
   void BackprojectView (const double* const t, double view_angle);


@@ -79,7 +82,7 @@ class BackprojectTrig : public Backproject
 class BackprojectTable : public Backproject
 {
  public:
 class BackprojectTable : public Backproject
 {
  public:

-  BackprojectTable (const RAYSUM* rs, ImageFile& im, InterpolationType interpType);
+  BackprojectTable (const Projections& proj, ImageFile& im, InterpolationType interpType);

   ~BackprojectTable ();
 
   void BackprojectView (const double* const t, double view_angle);
   ~BackprojectTable ();
 
   void BackprojectView (const double* const t, double view_angle);


@@ -95,7 +98,7 @@ class BackprojectTable : public Backproject
 class BackprojectDiff : public Backproject
 {
  public:
 class BackprojectDiff : public Backproject
 {
  public:

-  BackprojectDiff (const RAYSUM* rs, ImageFile& im, InterpolationType interpType);
+  BackprojectDiff (const Projections& proj, ImageFile& im, InterpolationType interpType);

   ~BackprojectDiff ();
 
   void BackprojectView (const double* const t, double view_angle);
   ~BackprojectDiff ();
 
   void BackprojectView (const double* const t, double view_angle);


@@ -109,8 +112,8 @@ class BackprojectDiff : public Backproject
 class BackprojectDiff2 : public BackprojectDiff
 {
  public:
 class BackprojectDiff2 : public BackprojectDiff
 {
  public:

-  BackprojectDiff2 (const RAYSUM* rs, ImageFile& im, InterpolationType interpType)
-    :  BackprojectDiff::BackprojectDiff (rs, im, interpType)
+  BackprojectDiff2 (const Projections& proj, ImageFile& im, InterpolationType interpType)
+    :  BackprojectDiff::BackprojectDiff (proj, im, interpType)

     {}
 
   void BackprojectView (const double* const t, double view_angle);
     {}
 
   void BackprojectView (const double* const t, double view_angle);


@@ -119,12 +122,12 @@ class BackprojectDiff2 : public BackprojectDiff
 class BackprojectIntDiff2 : public BackprojectDiff
 {
  public:
 class BackprojectIntDiff2 : public BackprojectDiff
 {
  public:

-  BackprojectIntDiff2 (const RAYSUM* rs, ImageFile& im, InterpolationType interpType)
-    :  BackprojectDiff::BackprojectDiff (rs, im, interpType)
+  BackprojectIntDiff2 (const Projections& proj, ImageFile& im, InterpolationType interpType)
+    :  BackprojectDiff::BackprojectDiff (proj, im, interpType)

     {}
   
   void BackprojectView (const double* const t, double view_angle);
 };
 
 
     {}
   
   void BackprojectView (const double* const t, double view_angle);
 };
 
 

-Backproject* selectBackprojector (BackprojType type, const RAYSUM*, ImageFile& im, InterpolationType interpType);
+Backproject* selectBackprojector (BackprojType type, const Projections& proj, ImageFile& im, InterpolationType interpType);