X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fprojections.h;h=38aea33307f716cff873a16961a4130c496602c2;hp=67cae86462ad282856fdf99733c1756f5425481f;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hpb=999a754d1519a49ca062ee87b22bf601c1ee9f21

diff --git a/include/projections.h b/include/projections.h
index 67cae86..38aea33 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.30 2001/03/11 06:34:37 kevin Exp $
+**  $Id$
 **
 **
 **  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;
 };
 
 
@@ -118,6 +122,10 @@ class Projections
   void printProjectionData ();
   void printScanInfo (std::ostringstream& os) const;
 
+  int Helical180LI(int interpView);
+  int Helical180LI_Equiangular(int interpView);
+  int HalfScanFeather(void);
+
   bool read (const std::string& fname);
   bool read (const char* fname);
   bool write (const char* fname);
@@ -125,13 +133,15 @@ 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);
-  bool calcArrayPolarCoordinates (unsigned int nx, unsigned int ny, double** ppdView, double** ppdDet);
+  void calcArrayPolarCoordinates (unsigned int nx, unsigned int ny, double** ppdView, double** ppdDet, 
+    int iNumDetWithZeros, double dZeropadRatio, double dDetInc);
   void interpolatePolar (ImageFileArray& v, ImageFileArray& vImag, unsigned int nx, unsigned int ny, std::complex<double>** ppcDetValue,
-    double** ppdDet, double** ppdView, unsigned int nView, unsigned int nDet, int iInterpolate);
+    double** ppdDet, double** ppdView, unsigned int nView, unsigned int nDet, unsigned int nDetWithZeros, 
+    int iInterpolate);
 
   bool reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* frequencyFilterName, const char* const interpName, int interp_param, const char* const backprojName, const int trace) const;
 
@@ -154,7 +164,7 @@ class Projections
   int geometry() const {return m_geometry;}
   double focalLength() const {return m_dFocalLength;}
   double sourceDetectorLength() const { return m_dSourceDetectorLength;}
-
+  double viewDiameter() const {return m_dViewDiameter; }
   double phmLen() const { return m_dViewDiameter / SQRT2; }
   void setPhmLen(double phmLen) { m_dViewDiameter = phmLen * SQRT2; }