X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fphantom.cpp;h=a0ddc408937b8f8f382c36ae95bbc320a522ace0;hp=fea8e6e55aa1b7790a8d4eb9ad9a2b0d9df2803b;hb=50fd2b2fb2ff63871986e6853dbebad0ecd00698;hpb=c5e7140bd08b8c8f527713e8dc861bcb7ee5f633

diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp
index fea8e6e..a0ddc40 100644
--- a/libctsim/phantom.cpp
+++ b/libctsim/phantom.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: phantom.cpp,v 1.28 2001/02/08 06:25:07 kevin Exp $
+**  $Id: phantom.cpp,v 1.29 2001/02/09 14:34:16 kevin Exp $
 **
 **  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
@@ -32,26 +32,20 @@ const double PhantomElement::SCALE_PELEM_EXTENT=0.005;  // increase pelem limits
 
 const int Phantom::PHM_INVALID = -1;
 const int Phantom::PHM_HERMAN = 0;
-const int Phantom::PHM_B_HERMAN = 1;
-const int Phantom::PHM_SHEPP_LOGAN = 2;
-const int Phantom::PHM_B_SHEPP_LOGAN = 3;
-const int Phantom::PHM_UNITPULSE = 4;
+const int Phantom::PHM_SHEPP_LOGAN = 1;
+const int Phantom::PHM_UNITPULSE = 2;
 
 const char* Phantom::s_aszPhantomName[] = 
 {
   {"herman"},
-  {"herman-b"},
   {"shepp-logan"},
-  {"shepp-logan-b"},
-  {"unitpulse"},
+  {"unit-pulse"},
 };
 
 const char* Phantom::s_aszPhantomTitle[] = 
 {
   {"Herman Head"},
-  {"Herman Head (Bordered)"},
   {"Shepp-Logan"},
-  {"Shepp-Logan (Bordered)"},
   {"Unit Pulse"},
 };
 
@@ -156,15 +150,9 @@ Phantom::createFromPhantom (const int phmid)
     case PHM_HERMAN:
       addStdHerman();
       break;
-    case PHM_B_HERMAN:
-      addStdHermanBordered();
-      break;
     case PHM_SHEPP_LOGAN:
       addStdSheppLogan();
       break;
-    case PHM_B_SHEPP_LOGAN:
-      addStdSheppLoganBordered();
-      break;
     case PHM_UNITPULSE:
       m_composition = P_UNIT_PULSE;
       addPElem ("rectangle", 0., 0., 100., 100., 0., 0.);     // outline 
@@ -411,12 +399,6 @@ Phantom::addStdSheppLogan ()
   addPElem ("ellipse",  0.5538, -0.3858, 0.0330,  0.2060, -18.0,  0.03);
 }
 
-void 
-Phantom::addStdSheppLoganBordered ()
-{
-  addStdSheppLogan ();
-  addPElem ("rectangle", 0.000, 0.0000, 0.8600, 1.150, 0.0, 0.00);
-}
 
 /* NAME
  *   addStdHerman			Standard head phantom of G. T. Herman
@@ -446,12 +428,6 @@ Phantom::addStdHerman ()
   addPElem ("ellipse",  0.000,  0.00,  7.875, 5.7187,  90.00, -0.206);
 }
 
-void
-Phantom::addStdHermanBordered ()
-{
-  addStdHerman();
-  addPElem ("rectangle",  0.000, 0.00, 10.780, 8.110,  90.00, 0.000);
-}
 
 
 /* NAME