r409: *** empty log message ***

[ctsim.git] / tools / phm2pj.cpp

diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp
index c47eec9acd2da3da20257630734522c901c7f3b9..34557af8a08e0ca40b331b4a53fa335bb9648a7c 100644 (file)
--- a/tools/phm2pj.cpp
+++ b/tools/phm2pj.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2pj.cpp,v 1.19 2000/12/18 00:09:59 kevin Exp $
+**  $Id: phm2pj.cpp,v 1.23 2001/01/17 06:25:15 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 phm2pj_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.19 2000/12/18 00:09:59 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.23 2001/01/17 06:25:15 kevin Exp $";
 
 
 void 
@@ -98,7 +98,7 @@ void GatherProjectionsMPI (MPIWorld& mpiWorld, Projections& pjGlobal, Projection
 #endif
 
 int 
-phm2pj_main (int argc, char* argv[])
+phm2pj_main (int argc, char* const argv[])
 {
   Phantom phm;
   std::string optGeometryName = Scanner::convertGeometryIDToName(Scanner::GEOMETRY_PARALLEL);
@@ -281,7 +281,8 @@ phm2pj_main (int argc, char* argv[])
   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);
-  timerBcast.timerEndAndReport ("Time to broadcast variables");
+  if (opt_verbose)
+    timerBcast.timerEndAndReport ("Time to broadcast variables");
 
   if (mpiWorld.getRank() > 0 && optPhmName != "")
     phm.createFromPhantom (optPhmName.c_str());
@@ -324,26 +325,8 @@ phm2pj_main (int argc, char* argv[])
 
 #else
   Projections pjGlobal (scanner);
-#if HAVE_SGP
-  SGPDriver* pSGPDriver = NULL;
-  SGP* pSGP = NULL;
-  if (opt_trace >= Trace::TRACE_PHANTOM) {
-    pSGPDriver = new SGPDriver ("phm2pj", 600, 600);
-    pSGP = new SGP (*pSGPDriver);
-  }
-  scanner.collectProjections (pjGlobal, phm, opt_trace, pSGP);
-  if (opt_trace >= Trace::TRACE_PHANTOM) {
-    std::cout << "Press enter to continue\n";
-    cio_kb_getc();
-    delete pSGP;  pSGP = NULL;
-    delete pSGPDriver;  pSGPDriver = NULL;
-  }
-
-#else
   scanner.collectProjections (pjGlobal, phm, opt_trace);
 #endif
-
-#endif
   
 #ifdef HAVE_MPI
   if (mpiWorld.getRank() == 0) 
@@ -353,13 +336,13 @@ phm2pj_main (int argc, char* argv[])
       pjGlobal.setRemark (opt_desc);
       pjGlobal.write (opt_outfile);
       if (opt_verbose) {
-       phm.print();
-       std::cout << std::endl;
-       std::ostringstream os;
-       pjGlobal.printScanInfo (os);
-       std::cout << os.str() << std::endl;
-       std::cout << "  Remark: " << pjGlobal.remark() << std::endl;
-       std::cout << "Run time: " << pjGlobal.calcTime() << " seconds\n";
+        phm.print (std::cout);
+       std::cout << std::endl;
+             std::ostringstream os;
+             pjGlobal.printScanInfo (os);
+             std::cout << os.str() << std::endl;
+             std::cout << "  Remark: " << pjGlobal.remark() << std::endl;
+             std::cout << "Run time: " << pjGlobal.calcTime() << " seconds\n";
       }
     }