X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fphm2if.cpp;h=9ff3b9a1cbe54d0483d81a12287b7a2e0adf65e8;hp=ad1503d64194bc2612f2c61722fc8ddff9afa2ff;hb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10;hpb=a35f9818445c3d30109ebf7d68422ca81d02aaf9

diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp
index ad1503d..9ff3b9a 100644
--- a/tools/phm2if.cpp
+++ b/tools/phm2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2if.cpp,v 1.6 2000/08/02 18:06:46 kevin Exp $
+**  $Id: phm2if.cpp,v 1.10 2000/08/25 15:59:13 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
@@ -50,7 +50,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* szIdStr = "$Id: phm2if.cpp,v 1.6 2000/08/02 18:06:46 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.10 2000/08/25 15:59:13 kevin Exp $";
 
 void 
 phm2if_usage (const char *program)
@@ -63,9 +63,9 @@ phm2if_usage (const char *program)
   cout << "     ny              Number of pixels Y-axis" << endl;
   cout << "     --phantom       Phantom to use for projection" << endl;
   cout << "        herman       Herman head phantom" << endl;
-  cout << "        bherman      Bordered Herman head phantom" << endl;
-  cout << "        rowland      Rowland head phantom" << endl;
-  cout << "        browland     Bordered Rowland head phantom" << endl;
+  cout << "        herman-b     Herman head phantom (Bordered)" << endl;
+  cout << "        shepp-logan  Shepp-Logan head phantom" << endl;
+  cout << "        shepp-logan-b Shepp-Logan head phantom (Bordered)" << endl;
   cout << "        unitpulse    Unit pulse phantom" << endl;
   cout << "     --phmfile       Generate Phantom from phantom file" << endl;
   cout << "     --filter        Generate Phantom from a filter function" << endl;
@@ -122,6 +122,8 @@ phm2if_main (int argc, char* argv[])
   int optTrace = TRACE_NONE;
   bool optVerbose = false;
   bool optDebug = false;
+  char *endptr = NULL;
+  char *endstr;
   Timer timerProgram;
 
 #ifdef HAVE_MPI
@@ -131,9 +133,6 @@ phm2if_main (int argc, char* argv[])
 #endif
     while (1) {
       int c = getopt_long(argc, argv, "", my_options, NULL);
-      char *endptr = NULL;
-      char *endstr;
-      
       if (c == -1)
 	break;
       
@@ -194,7 +193,7 @@ phm2if_main (int argc, char* argv[])
 	break;
         case O_VERSION:
 #ifdef VERSION
-	  cout <<  "Version " << VERSION << endl;
+	  cout << "Version " << VERSION << endl << g_szIdStr << endl;
 #else
           cerr << "Unknown version number" << endl;
 #endif