X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fphm2pj.cpp;h=2d0ba705c87c3c164dd83ab12f229e6a665dadc2;hb=d27e3b0708ba2fb395944278486bf125e4f362a5;hp=507cecf5159281f7bdd0c6b2ff6a9eac05fed3f5;hpb=17f20398d8bb0e4b97b5884b999bbe8d58c5254f;p=ctsim.git diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp index 507cecf..2d0ba70 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.26 2001/02/16 00:28:41 kevin Exp $ +** $Id: phm2pj.cpp,v 1.27 2001/02/19 20:23:17 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 @@ -51,7 +51,7 @@ static struct option phm2pj_options[] = {0, 0, 0, 0} }; -static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.26 2001/02/16 00:28:41 kevin Exp $"; +static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.27 2001/02/19 20:23:17 kevin Exp $"; void @@ -71,7 +71,7 @@ phm2pj_usage (const char *program) std::cout << " --phmfile Get Phantom from phantom file\n"; std::cout << " --desc Description of raysum\n"; std::cout << " --nray Number of rays per detector (default = 1)\n"; - std::cout << " --rotangle Degrees to rotate view through (multiple of PI)\n"; + std::cout << " --rotangle Angle to rotate view through (fraction of a circle)\n"; std::cout << " (default = select appropriate for geometry)\n"; std::cout << " --geometry Geometry of scanning\n"; std::cout << " parallel Parallel scan beams (default)\n"; @@ -253,9 +253,9 @@ phm2pj_main (int argc, char* const argv[]) if (opt_rotangle < 0) { if (optGeometryName.compare ("parallel") == 0) - opt_rotangle = 1; + opt_rotangle = 0.5; else - opt_rotangle = 2; + opt_rotangle = 1.0; } std::ostringstream desc; @@ -311,7 +311,7 @@ phm2pj_main (int argc, char* const argv[]) phm.createFromPhantom (optPhmName.c_str()); #endif - opt_rotangle *= PI; + opt_rotangle *= TWOPI; Scanner scanner (phm, optGeometryName.c_str(), opt_ndet, opt_nview, opt_nray, opt_rotangle, dOptFocalLength, dOptViewRatio, dOptScanRatio); if (scanner.fail()) { std::cout << "Scanner Creation Error: " << scanner.failMessage() << std::endl;