** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: phm2if.cpp,v 1.7 2000/08/02 18:09:11 kevin Exp $
+** $Id: phm2if.cpp,v 1.13 2000/11/09 00:12:25 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: phm2if.cpp,v 1.7 2000/08/02 18:09:11 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.13 2000/11/09 00:12:25 kevin Exp $";
void
phm2if_usage (const char *program)
cout << " ny Number of pixels Y-axis" << endl;
cout << " --phantom Phantom to use for projection" << endl;
cout << " herman Herman head phantom" << endl;
- cout << " bherman Bordered Herman head phantom" << endl;
- cout << " rowland Rowland head phantom" << endl;
- cout << " browland Bordered Rowland head phantom" << endl;
+ cout << " herman-b Herman head phantom (Bordered)" << endl;
+ cout << " shepp-logan Shepp-Logan head phantom" << endl;
+ cout << " shepp-logan-b Shepp-Logan head phantom (Bordered)" << endl;
cout << " unitpulse Unit pulse phantom" << endl;
cout << " --phmfile Generate Phantom from phantom file" << endl;
cout << " --filter Generate Phantom from a filter function" << endl;
cout << " --nsample Number of samples per axis per pixel (default = 1)" << endl;
cout << " --trace Trace level to use" << endl;
cout << " none No tracing (default)" << endl;
- cout << " text Trace text level" << endl;
- cout << " phm Trace phantom" << endl;
- cout << " rays Trace rays" << endl;
+ cout << " console Trace text level" << endl;
+ cout << " phantom Trace phantom" << endl;
+ cout << " proj Trace projections" << endl;
cout << " plot Trace plot" << endl;
cout << " clipping Trace clipping" << endl;
cout << " --debug Debug mode" << endl;
{
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;
int opt_nsample = 1;
double optFilterParam = 1.;
double optFilterBW = 1.;
- int optTrace = TRACE_NONE;
+ int optTrace = Trace::TRACE_NONE;
bool optVerbose = false;
bool optDebug = false;
+ char *endptr = NULL;
+ char *endstr;
Timer timerProgram;
#ifdef HAVE_MPI
#endif
while (1) {
int c = getopt_long(argc, argv, "", my_options, NULL);
- char *endptr = NULL;
- char *endstr;
-
if (c == -1)
break;
optDebug = true;
break;
case O_TRACE:
- if ((optTrace = TraceLevel::convertTraceNameToID(optarg)) == TRACE_INVALID) {
+ if ((optTrace = Trace::convertTraceNameToID(optarg)) == Trace::TRACE_INVALID) {
phm2if_usage(argv[0]);
return (1);
}
break;
case O_VERSION:
#ifdef VERSION
- cout << "Version " << VERSION << endl;
+ cout << "Version " << VERSION << endl << g_szIdStr << endl;
#else
cerr << "Unknown version number" << endl;
#endif
}
} 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");
pImGlobal->filterResponse (optDomainName.c_str(), optFilterBW, optFilterName.c_str(), optFilterParam);
} else {
#if HAVE_SGP
- if (optTrace >= TRACE_PHM)
+ if (optTrace >= Trace::TRACE_PHANTOM)
phm.show();
#endif
phm.convertToImagefile (*pImGlobal, opt_nsample, optTrace);
if (optVerbose)
cout << "Time to rasterized phantom: " << calctime << " seconds" << endl;
- if (optTrace >= TRACE_PHM) {
+ if (optTrace >= Trace::TRACE_PHANTOM) {
double dmin, dmax;
int nscale;