** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: phm2pj.cpp,v 1.10 2000/08/25 15:59:13 kevin Exp $
+** $Id: phm2pj.cpp,v 1.11 2000/08/27 20:32:55 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
{0, 0, 0, 0}
};
-static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.10 2000/08/25 15:59:13 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.11 2000/08/27 20:32:55 kevin Exp $";
void
{
cout << "usage: " << fileBasename(program) << " outfile ndet nview [--phantom phantom-name] [--phmfile filename] [OPTIONS]\n";
cout << "Calculate (projections) through phantom object, either a predefined --phantom or a --phmfile\n\n";
- cout << " outfile Name of output file for raysums\n";
+ cout << " outfile Name of output file for projections\n";
cout << " ndet Number of detectors\n";
cout << " nview Number of rotated views\n";
cout << " --phantom Phantom to use for projection\n";
cout << " (default = 1)\n";
cout << " --trace Trace level to use\n";
cout << " none No tracing (default)\n";
- cout << " text Trace text level\n";
- cout << " phm Trace phantom image\n";
- cout << " rays Trace rays\n";
+ cout << " console Trace text level\n";
+ cout << " phantom Trace phantom image\n";
+ cout << " proj Trace projections\n";
cout << " plot Trace plot\n";
cout << " clipping Trace clipping\n";
cout << " --verbose Verbose mode\n";
int opt_nray = 1;
double dOptFocalLength = 1.;
double dOptFieldOfView = 1.;
- int opt_trace = 0;
+ int opt_trace = Trace::TRACE_NONE;
string optPhmName (Phantom::convertPhantomIDToName(Phantom::PHM_HERMAN));
int opt_verbose = 0;
int opt_debug = 0;
break;
break;
case O_TRACE:
- if ((opt_trace = TraceLevel::convertTraceNameToID(optarg)) == TRACE_INVALID) {
+ if ((opt_trace = Trace::convertTraceNameToID(optarg)) == Trace::TRACE_INVALID) {
phm2pj_usage(argv[0]);
return (1);
}
#if HAVE_SGP
SGPDriver* pSGPDriver = NULL;
SGP* pSGP = NULL;
- if (opt_trace >= TRACE_PHM) {
+ 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_PHM) {
+ if (opt_trace >= Trace::TRACE_PHANTOM) {
cout << "Press enter to continue\n";
cio_kb_getc();
delete pSGP; pSGP = NULL;