X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fprojections.h;h=610cae76d3dc9b63189fba45a15e65739e3bfc9b;hb=e98a8a9d72a7b919debbbc9d1b0f237fe71c0fb3;hp=35325dfe370ca34e1f0b5227d4819e2aae17680a;hpb=11ea72090da18aa290e2c3ab217f1d27736bca50;p=ctsim.git

diff --git a/include/projections.h b/include/projections.h
index 35325df..610cae7 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.24 2001/02/20 17:44:14 kevin Exp $
+**  $Id: projections.h,v 1.27 2001/03/02 02:08:14 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -54,13 +54,14 @@ class Projections
   ~Projections ();
 
   static const int getInterpCount() {return s_iInterpCount;}
-  static const char** getInterpNameArray() {return s_aszInterpName;}
-  static const char** getInterpTitleArray() {return s_aszInterpTitle;}
+  static const char* const* getInterpNameArray() {return s_aszInterpName;}
+  static const char* const* getInterpTitleArray() {return s_aszInterpTitle;}
   static int convertInterpNameToID (const char* const interpName);
   static const char* convertInterpIDToName (const int interpID);
   static const char* convertInterpIDToTitle (const int interpID);
 
   void initFromScanner (const Scanner& scanner);
+  bool initFromSomatomAR_STAR (int iNViews, int iNDets, unsigned char* pData, unsigned long lDataLength);
 
   void printProjectionData (int startView, int endView);
   void printProjectionData ();
@@ -99,6 +100,8 @@ class Projections
   int nView() const {return m_nView;}
   int geometry() const {return m_geometry;}
   double focalLength() const {return m_dFocalLength;}
+  double sourceDetectorLength() const { return m_dSourceDetectorLength;}
+
   double phmLen() const { return m_dViewDiameter / SQRT2; }
   void setPhmLen(double phmLen) { m_dViewDiameter = phmLen * SQRT2; }
 
@@ -131,6 +134,7 @@ class Projections
   double m_detStart;		// distance of beginning detector to center phantom
   double m_detInc;		// increment between detectors 
   double m_dFocalLength;
+  double m_dSourceDetectorLength;
   double m_dViewDiameter;
   double m_dFanBeamAngle;
   kuint32 m_year;                   // Creation date & time
@@ -144,8 +148,8 @@ class Projections
 
   const static kuint16 m_signature;
 
-  static const char* s_aszInterpName[];
-  static const char* s_aszInterpTitle[];
+  static const char* const s_aszInterpName[];
+  static const char* const s_aszInterpTitle[];
   static const int s_iInterpCount;
 
   bool headerWrite (fnetorderstream& fs);