X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fphm2if.cpp;h=de845725f964c20c9333f917922b32267de57920;hb=fe5e8e2752729fa51f7d5c93e267404b6a333dab;hp=53abeab5e0c1c46517988f9c4d83690dd3eb2e51;hpb=6bfb747f8163381d94a02c03a0351e9ca6815d22;p=ctsim.git

diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp
index 53abeab..de84572 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.11 2000/08/27 20:32:55 kevin Exp $
+**  $Id: phm2if.cpp,v 1.14 2000/11/29 11:12:53 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* g_szIdStr = "$Id: phm2if.cpp,v 1.11 2000/08/27 20:32:55 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.14 2000/11/29 11:12:53 kevin Exp $";
 
 void 
 phm2if_usage (const char *program)
@@ -108,7 +108,7 @@ phm2if_main (int argc, char* argv[])
 {
   ImageFile* pImGlobal = NULL;
   Phantom phm;
-  string optPhmName (Phantom::convertPhantomIDToName(Phantom::PHM_HERMAN));
+  string optPhmName;
   string optFilterName;
   string optDomainName (SignalFilter::convertDomainIDToName (SignalFilter::DOMAIN_SPATIAL));
   string optOutFilename;
@@ -301,7 +301,7 @@ phm2if_main (int argc, char* argv[])
   pImGlobal = new ImageFile (opt_nx, opt_ny);
 #endif
 
-  ImageFileArray v;
+  ImageFileArray v = NULL;
 #ifdef HAVE_MPI
   if (mpiWorld.getRank() == 0)
     v = pImGlobal->getArray ();
@@ -316,7 +316,7 @@ phm2if_main (int argc, char* argv[])
     }
   } else {
     TimerCollectiveMPI timerRasterize (mpiWorld.getComm());
-    phm.convertToImagefile (*pImLocal, opt_nsample, optTrace, mpiWorld.getMyStartWorkUnit(), mpiWorld.getMyLocalWorkUnits());
+    phm.convertToImagefile (*pImLocal, opt_nsample, optTrace, mpiWorld.getMyStartWorkUnit(), mpiWorld.getMyLocalWorkUnits(), false);
     if (optVerbose)
       timerRasterize.timerEndAndReport ("Time to rasterize phantom");