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

diff --git a/include/projections.h b/include/projections.h
index 39cb09a..67cae86 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.28 2001/03/10 23:14:15 kevin Exp $
+**  $Id: projections.h,v 1.30 2001/03/11 06:34:37 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -37,33 +37,54 @@ class fnetorderstream;
 #include "array2dfile.h"
 #include "imagefile.h"
 #include <complex>
+#include <vector>
+
 
 //used for rebinning divergent beam projections to parallel
 class ParallelRaysumCoordinate {  
 public:
   double m_dT;      // Distance from center of origin
   double m_dTheta;  // perpendicular angle to origin
-  int m_iViewNum;   // View number for this raysum
-  int m_iDetNum;    // Detector number for this raysum
+  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; }
+
+  // sort first by T, then Theta
+  static bool compareByT (ParallelRaysumCoordinate* a, ParallelRaysumCoordinate* b)
+  { return a->m_dT == b->m_dT ? b->m_dTheta > a->m_dTheta : b->m_dT > a->m_dT; }
+
 };
 
 class ParallelRaysums {
-private:
-  ParallelRaysumCoordinate** m_ppCoordinates;
-  int m_iNumCoordinates;
-
 public:
   ParallelRaysums (Projections* pProjections);
   ~ParallelRaysums ();
 
-  ParallelRaysumCoordinate** getCoordinates() {return m_ppCoordinates;}
+  typedef std::vector<ParallelRaysumCoordinate*> CoordinateContainer;
+  typedef CoordinateContainer::iterator CoordinateIterator;
+
+  CoordinateContainer& getCoordinates() {return m_vecpCoordinates;}
   int getNumCoordinates() const {return m_iNumCoordinates;}
   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);
+  void getThetaAndRaysumsForT (int iT, double* pdTheta, double* pdRaysum);
+  void getDetPositions (double* pdDetPos);
+
+private:
+  CoordinateContainer m_vecpCoordinates;
+  CoordinateContainer m_vecpSortedByT;
+  CoordinateContainer m_vecpSortedByTheta;
+  int m_iNumCoordinates;
+  int m_iNumView;
+  int m_iNumDet;
 };
 
 
@@ -104,7 +125,7 @@ class Projections
   bool detarrayRead (fnetorderstream& fs, DetectorArray& darray, const int view_num);
   bool detarrayWrite (fnetorderstream& fs, const DetectorArray& darray, const int view_num);
 
-  bool interpolateToParallel();
+  Projections* interpolateToParallel();
 
   bool convertPolar (ImageFile& rIF, int iInterpolation);
   bool convertFFTPolar (ImageFile& rIF, int iInterpolation, int iZeropad);