r499: no message

[ctsim.git] / include / projections.h

diff --git a/include/projections.h b/include/projections.h
index a09f481c351db0006168b1743b6a83a2b1ad89ce..48ca0f44710f737b2e4bbfe950bd086bfa1e2c9d 100644 (file)
--- 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.21 2001/01/28 19:10:18 kevin Exp $
+**  $Id: projections.h,v 1.22 2001/02/08 06:25:07 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@ class Projections
   void setNView (int nView);  // used in MPI to restrict # of views
   void setRotInc (double rotInc) { m_rotInc = rotInc;}
   void setDetInc (double detInc) { m_detInc = detInc;}
-  void setPhmLen (double phmLen) { m_phmLen = phmLen;}
   void setCalcTime (double calcTime) {m_calcTime = calcTime;}
   void setRemark (const char* remark) {m_remark = remark; m_label.setLabelString(remark);}
   void setRemark (const std::string& remark) {setRemark(remark.c_str());}
@@ -92,15 +91,15 @@ class Projections
   double detStart() const {return m_detStart;}
   double rotStart() const {return m_rotStart;}
   double calcTime() const {return m_calcTime;}
-  double phmLen() const {return m_phmLen;}
+  double viewLen() const {return m_dViewDiameter / SQRT2;}
   const char*  remark() const {return m_remark.c_str();}
   double detInc() const {return m_detInc;}
   double rotInc() const {return m_rotInc;}
   int nDet() const {return m_nDet;}
   int nView() const {return m_nView;}
   int geometry() const {return m_geometry;}
-  double focalLength() const {return m_focalLength;}
-  double fieldOfView() const {return m_fieldOfView;}
+  double focalLength() const {return m_dFocalLength;}
+  double phmLen() const { return m_dViewDiameter / SQRT2; }
 
   const std::string& getFilename() const {return m_filename;}
   Array2dFileLabel& getLabel() {return m_label;}
@@ -130,9 +129,9 @@ class Projections
   double m_rotInc;             // angle between rotations 
   double m_detStart;           // distance of beginning detector to center phantom
   double m_detInc;             // increment between detectors 
-  double m_phmLen;             // Length of phantom edge (phm is square) 
-  double m_focalLength;
-  double m_fieldOfView;
+  double m_dFocalLength;
+  double m_dViewDiameter;
+  double m_dFanBeamAngle;
   kuint32 m_year;                   // Creation date & time
   kuint32 m_month;
   kuint32 m_day;