** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: phm2pj.cpp,v 1.1 2000/07/13 07:01:35 kevin Exp $
+** $Id: phm2pj.cpp,v 1.5 2000/07/28 08:28:08 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
phm2pj_main (int argc, char* argv[])
{
Phantom phm;
- string optGeometryName = Scanner::GEOMETRY_PARALLEL_STR;
+ string optGeometryName = Scanner::convertGeometryIDToName(Scanner::GEOMETRY_PARALLEL);
char *opt_outfile = NULL;
string opt_desc;
string optPhmFileName;
int opt_nview;
int opt_nray = 1;
int opt_trace = 0;
- string optPhmName = Phantom::PHM_HERMAN_STR;
+ string optPhmName (Phantom::convertPhantomIDToName(Phantom::PHM_HERMAN));
int opt_verbose = 0;
int opt_debug = 0;
double opt_rotangle = 1;
break;
break;
case O_TRACE:
- if ((opt_trace = convertTraceNameToID(optarg)) == TRACE_INVALID) {
+ if ((opt_trace = TraceLevel::convertTraceNameToID(optarg)) == TRACE_INVALID) {
phm2pj_usage(argv[0]);
return (1);
}
#else
Projections pjGlobal (scanner);
- scanner.collectProjections (pjGlobal, phm, 0, opt_trace);
+
+ SGPDriver* pSGPDriver = NULL;
+ SGP* pSGP = NULL;
+
+ if (opt_trace >= TRACE_PHM) {
+ pSGPDriver = new SGPDriver ("phm2pj");
+ pSGP = new SGP (*pSGPDriver);
+ }
+
+ scanner.collectProjections (pjGlobal, phm, 0, opt_trace, pSGP);
+
+ if (opt_trace >= TRACE_PHM) {
+ cout << "Press enter to continue\n";
+ cio_kb_getc();
+ delete pSGP; pSGP = NULL;
+ delete pSGPDriver; pSGPDriver = NULL;
+ }
+
#endif
#ifdef HAVE_MPI
try {
retval = phm2pj_main(argc, argv);
+#if HAVE_DMALLOC
+ // dmalloc_shutdown();
+#endif
} catch (exception e) {
cerr << "Exception: " << e.what() << endl;
} catch (...) {