X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fprojections.h;h=c88fca709552c694e375ced81711486e91732df6;hp=3b7e78fcf5d0c60f26b4e25e72788ea6ec059b59;hb=4433641931aa27fd6a2b5ecd0102e6c5bbbccc46;hpb=758774f7a87d488faa7412a04d07e4cce140b66c

diff --git a/include/projections.h b/include/projections.h
index 3b7e78f..c88fca7 100644
--- a/include/projections.h
+++ b/include/projections.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: projections.h,v 1.31 2001/03/11 12:37:34 kevin Exp $
+**  $Id: projections.h,v 1.33 2001/03/13 08:24:41 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -47,11 +47,6 @@ public:
   double m_dTheta;  // perpendicular angle to origin
   double m_dRaysum;
 
-  bool lessThanT (ParallelRaysumCoordinate& rCompare)
-  {return m_dT < rCompare.m_dT; }
-  bool lessThanTheta (ParallelRaysumCoordinate& rCompare)
-  {return m_dTheta < rCompare.m_dTheta; }
-
   static bool compareByTheta (ParallelRaysumCoordinate* a, ParallelRaysumCoordinate* b)
   { return a->m_dTheta == b->m_dTheta ? b->m_dT > a->m_dT : b->m_dTheta > a->m_dTheta; }
 
@@ -63,7 +58,14 @@ public:
 
 class ParallelRaysums {
 public:
-  ParallelRaysums (Projections* pProjections);
+
+  enum {
+    THETA_RANGE_UNCONSTRAINED = 0,
+    THETA_RANGE_NORMALIZE_TO_TWOPI,
+    THETA_RANGE_FOLD_TO_PI,
+  };
+
+  ParallelRaysums (const Projections* pProjections, int iThetaRange);
   ~ParallelRaysums ();
 
   typedef std::vector<ParallelRaysumCoordinate*> CoordinateContainer;
@@ -74,7 +76,7 @@ public:
   void getLimits (double* dMinT, double* dMaxT, double* dMinTheta, double* dMaxTheta) const;
   CoordinateContainer& getSortedByT();
   CoordinateContainer& getSortedByTheta();
-  double interpolate (double* pdX, double* pdY, int n, double dXValue);
+  double interpolate (double* pdX, double* pdY, int n, double dXValue, int* iLastFloor = NULL);
   void getThetaAndRaysumsForT (int iT, double* pdTheta, double* pdRaysum);
   void getDetPositions (double* pdDetPos);
 
@@ -82,9 +84,11 @@ private:
   CoordinateContainer m_vecpCoordinates;
   CoordinateContainer m_vecpSortedByT;
   CoordinateContainer m_vecpSortedByTheta;
+  ParallelRaysumCoordinate* m_pCoordinates;
   int m_iNumCoordinates;
   int m_iNumView;
   int m_iNumDet;
+  int m_iThetaRange;
 };
 
 
@@ -125,7 +129,7 @@ class Projections
   bool detarrayRead (fnetorderstream& fs, DetectorArray& darray, const int view_num);
   bool detarrayWrite (fnetorderstream& fs, const DetectorArray& darray, const int view_num);
 
-  Projections* interpolateToParallel();
+  Projections* interpolateToParallel() const;
 
   bool convertPolar (ImageFile& rIF, int iInterpolation);
   bool convertFFTPolar (ImageFile& rIF, int iInterpolation, int iZeropad);