Update copyright date; remove old CVS keyword

[ctsim.git] / include / scanner.h

diff --git a/include/scanner.h b/include/scanner.h
index 77962cb9812f816d8418812abd6b9531c014a177..d302b67b657ce1dcbf660d2df85075c2e3dc2924 100644 (file)
--- a/include/scanner.h
+++ b/include/scanner.h
@@ -7,10 +7,7 @@
 **   Date Started:  July 1, 1984
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id$
-**
+**  Copyright (C) 1983-2009 Kevin Rosenberg
 **
 **  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
@@ -56,9 +53,9 @@ class DetectorArray
       { m_viewAngle = viewAngle; }
 
  private:
-  DetectorValue* m_detValues;  // Pointer to array of values recorded by detector 
-  int m_nDet;                  // Number of detectors in array */
-  double m_viewAngle;           // View angle in radians 
+  DetectorValue* m_detValues;   // Pointer to array of values recorded by detector
+  int m_nDet;                   // Number of detectors in array */
+  double m_viewAngle;           // View angle in radians
 
   DetectorArray& operator=(const DetectorArray& rhs);   // assignment
   DetectorArray (const DetectorArray& rhs);             // copy constructor
@@ -68,18 +65,18 @@ class DetectorArray
 class Scanner
 {
  public:
-  static const int Scanner::GEOMETRY_INVALID;
-  static const int Scanner::GEOMETRY_PARALLEL;
-  static const int Scanner::GEOMETRY_EQUILINEAR;
-  static const int Scanner::GEOMETRY_EQUIANGULAR;
-  static const int Scanner::GEOMETRY_LINOGRAM;
-
-  
-  Scanner (const Phantom& phm, const char* const geometryName, int nDet, 
-    int nView, int iOffsetView, int nSample, const double rot_anglen, 
+  static const int GEOMETRY_INVALID;
+  static const int GEOMETRY_PARALLEL;
+  static const int GEOMETRY_EQUILINEAR;
+  static const int GEOMETRY_EQUIANGULAR;
+  static const int GEOMETRY_LINOGRAM;
+
+
+  Scanner (const Phantom& phm, const char* const geometryName, int nDet,
+    int nView, int iOffsetView, int nSample, const double rot_anglen,
     double dFocalLengthRatio, double dCenterDetectorRatio, double dViewRatio, double dScanRatio);
   ~Scanner();
-  
+
   void collectProjections (Projections& proj, const Phantom& phm, const int trace = Trace::TRACE_NONE,
     SGP* pSGP = NULL);
 
@@ -95,7 +92,7 @@ class Scanner
   unsigned int nDet() const {return m_nDet;}
   unsigned int nView() const {return m_nView;}
   unsigned int offsetView() const {return m_iOffsetView;}
-  unsigned int startView() const {return m_startView;} 
+  unsigned int startView() const {return m_startView;}
   double rotInc() const {return m_rotInc;}
   double detInc() const {return m_detInc;}
   double detLen() const {return m_detLen;}
@@ -116,41 +113,41 @@ class Scanner
   static int convertGeometryNameToID (const char* const geometryName);
   static const char* convertGeometryIDToName (const int idGeometry);
   static const char* convertGeometryIDToTitle (const int idGeometry);
-  
+
  private:
   bool m_fail;
   std::string m_failMessage;
   int m_idGeometry;
-  unsigned int m_nDet;         /* Number of detectors in array */
-  unsigned int m_nView;                /* Number of rotated views */
-  unsigned int m_iOffsetView; 
-  unsigned int m_startView; 
-  unsigned int m_nSample;      /* Number of rays per detector */
+  unsigned int m_nDet;          /* Number of detectors in array */
+  unsigned int m_nView;         /* Number of rotated views */
+  unsigned int m_iOffsetView;
+  unsigned int m_startView;
+  unsigned int m_nSample;       /* Number of rays per detector */
   double m_dFocalLength;        // Focal Length, distance from source to center
   double m_dSourceDetectorLength; // Distance from source to detectors
   double m_dCenterDetectorLength; // Distance from center to detectors
   double m_dViewDiameter; // Diameter of area being processed
   double m_dScanDiameter; // Diamer of area being scanned
   double m_dViewRatio;   // View Ratio to diameter phantom
-  double m_dFocalLengthRatio;   // Source to Center Length as ratio to viewDiameter radius 
+  double m_dFocalLengthRatio;   // Source to Center Length as ratio to viewDiameter radius
   double m_dCenterDetectorRatio; // Center to Detector Length as ratio of viewDiameter radius
   double m_dScanRatio;       // Scan length to view length ratio
   double m_dFanBeamAngle;
-  double m_detLen;             // Total length of detector array 
-  double m_rotLen;             // Rotation angle length in radians (norm 2PI)
-  double m_detInc;             // Increment between centers of detectors 
-  double m_rotInc;             // Increment in rotation angle between views 
+  double m_detLen;              // Total length of detector array
+  double m_rotLen;              // Rotation angle length in radians (norm 2PI)
+  double m_detInc;              // Increment between centers of detectors
+  double m_rotInc;              // Increment in rotation angle between views
   double m_detStart;
   double m_dXCenter;            // Center of Phantom
-  double m_dYCenter;            
+  double m_dYCenter;
   double m_dAngularDetIncrement;
   double m_dAngularDetLen;
 
   int m_trace;
   struct {
-    double xd1,yd1,xd2,yd2;    /* Coordinates of detector endpoints */
-    double xs1,ys1,xs2,ys2;    /* Coordinates of source endpoints */
-    double angle;              /* Starting angle */
+    double xd1,yd1,xd2,yd2;     /* Coordinates of detector endpoints */
+    double xs1,ys1,xs2,ys2;     /* Coordinates of source endpoints */
+    double angle;               /* Starting angle */
     double dAngularDet;
   } m_initPos;