projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r180: *** empty log message ***
[ctsim.git]
/
tools
/
phm2pj.cpp
diff --git
a/tools/phm2pj.cpp
b/tools/phm2pj.cpp
index 4c12ecf6f1e1d037bafdd731dc1821757ad4467f..82cad2f5ab8d92b69e97280a04336c233ed909ac 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: phm2pj.cpp,v 1.
5 2000/07/28 08:28:08
kevin Exp $
+** $Id: phm2pj.cpp,v 1.
9 2000/08/03 09:57:29
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
**
** 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
@@
-47,6
+47,8
@@
static struct option phm2pj_options[] =
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
+static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.9 2000/08/03 09:57:29 kevin Exp $";
+
void
phm2pj_usage (const char *program)
void
phm2pj_usage (const char *program)
@@
-161,7
+163,7
@@
phm2pj_main (int argc, char* argv[])
break;
case O_VERSION:
#ifdef VERSION
break;
case O_VERSION:
#ifdef VERSION
- cout << "Version: " << VERSION << endl;
+ cout << "Version: " << VERSION << endl
<< g_szIdStr << endl
;
#else
cout << "Unknown version number" << endl;
#endif
#else
cout << "Unknown version number" << endl;
#endif
@@
-285,17
+287,14
@@
phm2pj_main (int argc, char* argv[])
#else
Projections pjGlobal (scanner);
#else
Projections pjGlobal (scanner);
-
+#if HAVE_SGP
SGPDriver* pSGPDriver = NULL;
SGP* pSGP = NULL;
SGPDriver* pSGPDriver = NULL;
SGP* pSGP = NULL;
-
if (opt_trace >= TRACE_PHM) {
if (opt_trace >= TRACE_PHM) {
- pSGPDriver = new SGPDriver ("phm2pj");
+ pSGPDriver = new SGPDriver ("phm2pj"
, 600, 600
);
pSGP = new SGP (*pSGPDriver);
}
pSGP = new SGP (*pSGPDriver);
}
-
scanner.collectProjections (pjGlobal, phm, 0, opt_trace, pSGP);
scanner.collectProjections (pjGlobal, phm, 0, opt_trace, pSGP);
-
if (opt_trace >= TRACE_PHM) {
cout << "Press enter to continue\n";
cio_kb_getc();
if (opt_trace >= TRACE_PHM) {
cout << "Press enter to continue\n";
cio_kb_getc();
@@
-303,6
+302,10
@@
phm2pj_main (int argc, char* argv[])
delete pSGPDriver; pSGPDriver = NULL;
}
delete pSGPDriver; pSGPDriver = NULL;
}
+#else
+ scanner.collectProjections (pjGlobal, phm, 0, opt_trace);
+#endif
+
#endif
#ifdef HAVE_MPI
#endif
#ifdef HAVE_MPI