X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fphm2pj.cpp;h=4e4463da9bec97b6e9690b73ad55f57b155c9dbb;hb=78a89de38b3231c2f8672f2766c88b3ff2574a51;hp=c47eec9acd2da3da20257630734522c901c7f3b9;hpb=c572838c379c18ff4287728875f6fbb4ad687e54;p=ctsim.git diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp index c47eec9..4e4463d 100644 --- 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.21 2001/01/07 22:19:44 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.21 2001/01/07 22:19:44 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); @@ -353,13 +353,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"; } }