r117: *** empty log message ***

[ctsim.git] / src / phm2if.cpp

diff --git a/src/phm2if.cpp b/src/phm2if.cpp
index 60e504b193038f01f3f9658480dce78417bbdc6e..75119c9642b2fab18ffe01fdb1f50c1cff78f4e1 100644 (file)
--- a/src/phm2if.cpp
+++ b/src/phm2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2if.cpp,v 1.12 2000/06/19 20:08:09 kevin Exp $
+**  $Id: phm2if.cpp,v 1.13 2000/06/22 10:17:28 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
@@ -61,6 +61,7 @@ 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 << "        unitpulse    Unit pulse phantom" << endl;
@@ -107,9 +108,9 @@ phm2if_main (int argc, char* argv[])
   Phantom phm;
   int opt_nx = 0, opt_ny = 0;
   int opt_nsample = 1;
-  int opt_phmnum = -1;
-  FilterType opt_filter = static_cast<FilterType>(-1);
-  DomainType opt_filter_domain = D_SPATIAL;
+  string optPhmName;
+  string optFilterName;
+  string optDomainName = "spatial";
   char *opt_outfile = NULL;
   int opt_debug = 0;
   string opt_desc;
@@ -139,7 +140,9 @@ phm2if_main (int argc, char* argv[])
       
       switch (c) {
       case O_PHANTOM:
-       if ((opt_phmnum = opt_set_phantom(optarg)) < 0) {
+       optPhmName = optarg;
+       if (! phm.createFromPhantom (optPhmName.c_str())) {
+         cout << "Invalid phantom name " << optPhmName << endl << endl;
          phm2if_usage(argv[0]);
          return (1);
        }
@@ -166,16 +169,10 @@ phm2if_main (int argc, char* argv[])
        }
        break;
       case O_FILTER:
-       if ((opt_filter = opt_set_filter(optarg)) < 0) {
-         phm2if_usage (argv[0]);
-         return (1);
-       }
+       optFilterName = optarg;
        break;
       case O_FILTER_DOMAIN:
-       if ((opt_filter_domain = opt_set_filter_domain(optarg)) < 0) {
-         phm2if_usage (argv[0]);
-         return (1);
-       }
+       optDomainName = optarg;
        break;
       case O_DESC:
        opt_desc =  optarg;
@@ -223,7 +220,7 @@ phm2if_main (int argc, char* argv[])
       }
     }
     
-    if (phm.nPElem() == 0 && opt_phmnum == -1 && opt_filter == -1) {
+    if (phm.nPElem() == 0 && optPhmName == "" && optFilterName == "") {
       cerr << "No phantom defined" << endl;
       phm2if_usage(argv[0]);
       return (1);
@@ -253,11 +250,10 @@ phm2if_main (int argc, char* argv[])
     oss << "nx=" << opt_nx << ", ny=" << opt_ny << ", nsample=" << opt_nsample << ", ";
     if (opt_phmfilename.length())
       oss << "phantom=" << opt_phmfilename;
-    else if (opt_phmnum != -1)
-      oss << "phantom=" << name_of_phantom(opt_phmnum);
-    else if (opt_filter != -1) {
-      oss << "filter=" << name_of_filter(opt_filter);
-      oss << " - " << name_of_filter_domain(opt_filter_domain);
+    else if (optPhmName != "")
+      oss << "phantom=" << optPhmName;
+    else if (optFilterName != "") {
+      oss << "filter=" << optFilterName << " - " << optDomainName;
     }
     if (opt_desc.length())
       oss << ": " << opt_desc;
@@ -271,23 +267,27 @@ phm2if_main (int argc, char* argv[])
 
 #ifdef HAVE_MPI
   TimerCollectiveMPI timerBcast (mpiWorld.getComm());
+  mpiWorld.BcastString (optPhmName);
   mpiWorld.getComm().Bcast (&opt_verbose, 1, MPI::INT, 0);
   mpiWorld.getComm().Bcast (&opt_debug, 1, MPI::INT, 0);
   mpiWorld.getComm().Bcast (&opt_trace, 1, MPI::INT, 0);
   mpiWorld.getComm().Bcast (&opt_nx, 1, MPI::INT, 0);
   mpiWorld.getComm().Bcast (&opt_ny, 1, MPI::INT, 0);
   mpiWorld.getComm().Bcast (&opt_nsample, 1, MPI::INT, 0);
-  mpiWorld.getComm().Bcast (&opt_phmnum, 1, MPI::INT, 0);
-  mpiWorld.getComm().Bcast (&opt_filter, 1, MPI::INT, 0);
-  mpiWorld.getComm().Bcast (&opt_filter_domain, 1, MPI::INT, 0);
   mpiWorld.getComm().Bcast (&opt_filter_param, 1, MPI::DOUBLE, 0);
   mpiWorld.getComm().Bcast (&opt_filter_bw, 1, MPI::DOUBLE, 0);
 
+  mpiWorld.BcastString (optFilterName);
+  mpiWorld.BcastString (optDomainName);
+
   if (opt_verbose)
     timerBcast.timerEndAndReport ("Time to broadcast variables");
 
   mpiWorld.setTotalWorkUnits (opt_nx);
 
+  if (mpiWorld.getRank() > 0 && optPhmName != "")
+      phm.createFromPhantom (optPhmName.c_str());
+
   if (mpiWorld.getRank() == 0) {
     imGlobal = new ImageFile (opt_outfile, opt_nx, opt_ny);
     imGlobal->fileCreate();
@@ -298,17 +298,6 @@ phm2if_main (int argc, char* argv[])
   imGlobal->fileCreate ();
 #endif
 
-  if (opt_phmnum >= 0)
-      phm.create (opt_phmnum);
-
-#ifdef HAVE_MPI
-  else {
-    if (mpiWorld.getRank() == 0)
-      cerr << "phmnum < 0" << endl;
-    return (1);
-  }
-#endif
-
   ImageFileArray v;
 #ifdef HAVE_MPI
   if (mpiWorld.getRank() == 0)
@@ -318,9 +307,9 @@ phm2if_main (int argc, char* argv[])
     if (mpiWorld.getRank() == 0) {
       v[opt_nx/2][opt_ny/2] = 1.;
     }
-  } else if (opt_filter != -1) {
+  } else if (optFilterName != "") {
     if (mpiWorld.getRank() == 0) {
-      image_filter_response (*imGlobal, opt_filter_domain, opt_filter_bw, opt_filter, opt_filter_param, opt_trace);
+      image_filter_response (*imGlobal, optDomainName.c_str(), opt_filter_bw, optFilterName.c_str(), opt_filter_param, opt_trace);
     }
   } else {
     TimerCollectiveMPI timerRasterize (mpiWorld.getComm());
@@ -337,8 +326,8 @@ phm2if_main (int argc, char* argv[])
   v = imGlobal->getArray ();
   if (phm.getComposition() == P_UNIT_PULSE) {
     v[opt_nx/2][opt_ny/2] = 1.;
-  } else if (opt_filter != -1) {
-    image_filter_response (*imGlobal, opt_filter_domain, opt_filter_bw, opt_filter, opt_filter_param, opt_trace);
+  } else if (optFilterName != "") {
+    image_filter_response (*imGlobal, optDomainName.c_str(), opt_filter_bw, optFilterName.c_str(), opt_filter_param, opt_trace);
   } else {
 #if HAVE_SGP
       if (opt_trace >= TRACE_PHM)