r499: no message

[ctsim.git] / include / scanner.h

diff --git a/include/scanner.h b/include/scanner.h
index f0b498b72844e5d90ed223f243455b884d0cb985..162e89686744e2a34a9f04374e3333ea0fe7f007 100644 (file)
--- a/include/scanner.h
+++ b/include/scanner.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: scanner.h,v 1.16 2000/12/16 03:29:02 kevin Exp $
+**  $Id: scanner.h,v 1.17 2001/02/08 06:25:07 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -74,7 +74,9 @@ class Scanner
   static const int Scanner::GEOMETRY_EQUIANGULAR;
 
   
-  Scanner (const Phantom& phm, const char* const geometryName, int nDet, int nView, int nSample, const double rot_anglen, double dFieldOfView, double dFocalLength);
+  Scanner (const Phantom& phm, const char* const geometryName, int nDet, 
+    int nView, int nSample, const double rot_anglen, 
+    double dFocalLengthRatio, double dViewRatio, double dScanRatio);
   ~Scanner();
   
   void collectProjections (Projections& proj, const Phantom& phm, const int trace = Trace::TRACE_NONE, SGP* pSGP = NULL);
@@ -87,12 +89,15 @@ class Scanner
   const std::string& failMessage() const {return m_failMessage;}
   unsigned int nDet() const {return m_nDet;}
   unsigned int nView() const {return m_nView;}
-  double phmLen() const {return m_phmLen;}
+ 
   double rotInc() const {return m_rotInc;}
   double detInc() const {return m_detInc;}
   double detLen() const {return m_detLen;}
   double focalLength() const {return m_dFocalLength;}
-  double fieldOfView() const {return m_dFieldOfView;}
+  double viewDiameter() const {return m_dViewDiameter;}
+  double scanDiameter() const {return m_dScanDiameter;}
+  double fanBeamAngle() const {return m_dFanBeamAngle;}
+
   int geometry() const {return m_idGeometry;}
 
   static int getGeometryCount() {return s_iGeometryCount;}
@@ -109,15 +114,17 @@ class Scanner
   unsigned int m_nDet;         /* Number of detectors in array */
   unsigned int m_nView;                /* Number of rotated views */
   unsigned int m_nSample;      /* Number of rays per detector */
-  double m_dFieldOfView;        // Field of View
   double m_dFocalLength;        // Focal Length
-  double m_dFieldOfViewRatio;   // Field of View Ratio to diameter phmLen
-  double m_dFocalLengthRatio;   // Focal Length ratio to radius phmLen
+  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;   // Focal Length ratio to radius phantom
+  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_phmLen;              // Maximum Length of phantom or area of interest
   double m_dXCenter;            // Center of Phantom
   double m_dYCenter;            
   double m_dAngularDetIncrement;