X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fphm2pj.cpp;h=82cad2f5ab8d92b69e97280a04336c233ed909ac;hb=d158a6da6ec776fe98961f73f2ea74cf55de4700;hp=ee4832a08e8b2fd5597e457684a49ffeb436f36f;hpb=6b3ed4969c5a651aae71391127310ee797ecce6b;p=ctsim.git

diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp
index ee4832a..82cad2f 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.7 2000/08/02 18:09:11 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
@@ -47,7 +47,7 @@ static struct option phm2pj_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$id$";
+static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.9 2000/08/03 09:57:29 kevin Exp $";
 
 
 void 
@@ -163,7 +163,7 @@ phm2pj_main (int argc, char* argv[])
 	break;
         case O_VERSION:
 #ifdef VERSION
-	  cout << "Version: " << VERSION << endl;
+	  cout << "Version: " << VERSION << endl << g_szIdStr << endl;
 #else
           cout << "Unknown version number" << endl;
 #endif
@@ -287,17 +287,14 @@ phm2pj_main (int argc, char* argv[])
 
 #else
   Projections pjGlobal (scanner);
-
+#if HAVE_SGP
   SGPDriver* pSGPDriver = NULL;
   SGP* pSGP = NULL;
-
   if (opt_trace >= TRACE_PHM) {
     pSGPDriver = new SGPDriver ("phm2pj", 600, 600);
     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();
@@ -305,6 +302,10 @@ phm2pj_main (int argc, char* argv[])
     delete pSGPDriver;  pSGPDriver = NULL;
   }
 
+#else
+  scanner.collectProjections (pjGlobal, phm, 0, opt_trace);
+#endif
+
 #endif
   
 #ifdef HAVE_MPI