X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fphantom.h;h=9eb0bf37eb32cf4aeb2fcd8e40e8fafa0400c220;hb=82a12d49ecd2c09c301e6513b549c358f715e764;hp=5769b258610f162d2e0b49545cb943551be135a2;hpb=c5e7140bd08b8c8f527713e8dc861bcb7ee5f633;p=ctsim.git

diff --git a/include/phantom.h b/include/phantom.h
index 5769b25..9eb0bf3 100644
--- a/include/phantom.h
+++ b/include/phantom.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: phantom.h,v 1.22 2001/02/08 06:25:07 kevin Exp $
+**  $Id$
 **
 **  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
@@ -79,6 +79,8 @@ class PhantomElement
     const double u() const {return m_u;}
     const double v() const {return m_v;}
 
+    static PhmElemType convertNameToType (const char* const typeName);
+
     void printDefinition (std::ostream& os) const;
     void printDefinition (std::ostringstream& os) const;
 
@@ -100,7 +102,6 @@ class PhantomElement
     static const int POINTS_PER_CIRCLE;
     static const double SCALE_PELEM_EXTENT;  // increase pelem limits by 0.5% 
 
-    static PhmElemType convertNameToType (const char* const typeName);
     static const char* const convertTypeToName (PhmElemType iType);
 
     void makeTransformMatrices ();
@@ -136,9 +137,7 @@ class Phantom
  public:
     static const int PHM_INVALID;
     static const int PHM_HERMAN;
-    static const int PHM_B_HERMAN;
     static const int PHM_SHEPP_LOGAN;
-    static const int PHM_B_SHEPP_LOGAN;
     static const int PHM_UNITPULSE;
 
     Phantom ();
@@ -164,9 +163,11 @@ class Phantom
 
     void addPElem (const char* const composition, const double cx, const double cy, const double u, const double v, const double rot, const double atten);
 
-    void convertToImagefile (ImageFile& im, double dViewRatio, const int in_nsample, const int trace, const int colStart, const int colCount, bool bStoreAtColumnPos) const;
-
     void convertToImagefile (ImageFile& im, double dViewRatio, const int in_nsample, const int trace) const;
+    void convertToImagefile (ImageFile& im, double dViewRatio, const int in_nsample, const int trace, 
+      const int colStart, const int colCount, bool bStoreAtColumnPos) const;
+    void convertToImagefile (ImageFile& im, int iNX, double dViewRatio, const int in_nsample, const int trace, 
+      const int colStart, const int colCount, int iStorageOffset) const;
 
     void printDefinitions (std::ostream& os) const;
     void printDefinitions (std::ostringstream& os) const;
@@ -176,16 +177,14 @@ class Phantom
     const std::string& name() const     {return m_name;}
     const int id() const     {return m_id;}
 
-#if HAVE_SGP
+#ifdef HAVE_SGP
     void show () const;
     void show (SGP& sgp) const;
     void draw (SGP& sgp) const;
 #endif
     
     void addStdHerman ();
-    void addStdHermanBordered ();
     void addStdSheppLogan ();
-    void addStdSheppLoganBordered ();
 
     void print (std::ostream& os) const;
     void print (std::ostringstream& os) const;