r123: *** empty log message ***

[ctsim.git] / src / pj2if.cpp

diff --git a/src/pj2if.cpp b/src/pj2if.cpp
index 8723429cf541e18b959094799b60eabacebbf2c9..25b72cadfda6c128d9183e7e8a3fd0edf3f31d72 100644 (file)
--- a/src/pj2if.cpp
+++ b/src/pj2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: pj2if.cpp,v 1.5 2000/06/27 10:48:11 kevin Exp $
+**  $Id: pj2if.cpp,v 1.6 2000/06/28 15:25:34 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
@@ -33,6 +33,7 @@
  */
 
 #include "ct.h"
+#include "timer.h"
 
 
 enum { O_VERBOSE, O_HELP, O_VERSION };
@@ -63,10 +64,10 @@ int
 pj2if_main (const int argc, char *const argv[])
 {
   char *pj_name, *im_name;
-  int ix, iy;
-  bool opt_verbose = false;
+  bool optVerbose = false;
   extern int optind;
-  
+  Timer timerProgram;
+
   while (1)
     {
       int c = getopt_long (argc, argv, "", my_options, NULL);
@@ -76,7 +77,7 @@ pj2if_main (const int argc, char *const argv[])
       switch (c)
        {
        case O_VERBOSE:
-         opt_verbose = true;
+         optVerbose = true;
          break;
         case O_VERSION:
 #ifdef VERSION
@@ -109,25 +110,25 @@ pj2if_main (const int argc, char *const argv[])
     return (1);
   }
 
-  if (opt_verbose)
+  if (optVerbose)
       pj.printScanInfo();
   
   ImageFile im (pj.nDet(), pj.nView());
   
   ImageFileArray v = im.getArray();
 
-  for (iy = 0; iy < pj.nView(); iy++)
+  for (int iy = 0; iy < pj.nView(); iy++)
     {
       DetectorArray& detarray = pj.getDetectorArray (iy);
       const DetectorValue* detval = detarray.detValues();
-      for (ix = 0; ix < pj.nDet(); ix++)
+      for (int ix = 0; ix < pj.nDet(); ix++)
        {
          v[ix][iy] = detval[ix];
        }
     }
 
   im.labelAdd (pj.getLabel());
-  im.labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .pj to .if");
+  im.labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .pj to .if", timerProgram.timerEnd());
   im.fileWrite (im_name);
   
   return(0);