r91: Made ImageFile inherit from Array2dFile

[ctsim.git] / src / ctrec.cpp

diff --git a/src/ctrec.cpp b/src/ctrec.cpp
index 68b9ff669606260806bb0d8067519a05c24cd53a..ada1c10ce3c49c3c7a6a943f2c4c2762b0352079 100644 (file)
--- a/src/ctrec.cpp
+++ b/src/ctrec.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctrec.cpp,v 1.5 2000/06/09 01:35:33 kevin Exp $
+**  $Id: ctrec.cpp,v 1.6 2000/06/09 11:03: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
@@ -284,7 +284,7 @@ ctrec_main (int argc, char * argv[])
 
   if (mpiWorld.getRank() == 0) {
     im_global = new ImageFile (im_filename, nx, ny);
-    im_global->adf.fileCreate();
+    im_global->fileCreate();
   }
 
   im_local = new ImageFile (nx, ny);
@@ -295,7 +295,7 @@ ctrec_main (int argc, char * argv[])
     print_raysum_info(rs_global);
 
   im_global = new ImageFile (im_filename, nx, ny);
-  im_global->adf.fileCreate();
+  im_global->fileCreate();
 #endif
 
 #ifdef HAVE_MPI
@@ -317,8 +317,8 @@ ctrec_main (int argc, char * argv[])
   if (opt_verbose)
     mpi_t1 = MPI::Wtime();
 
-  int nxLocal = im_local->adf.nx();
-  int nyLocal = im_local->adf.ny();
+  int nxLocal = im_local->nx();
+  int nyLocal = im_local->ny();
   ImageFileArray vLocal = im_local->getArray();
   ImageFileArray vGlobal = NULL;
   if (mpiWorld.getRank() == 0)
@@ -353,10 +353,10 @@ ctrec_main (int argc, char * argv[])
     {
       raysum_close (rs_global);
       double calctime = time_end - time_start;
-      im_global->adf.arrayDataWrite ();
-      im_global->adf.labelAdd (Array2dFileLabel::L_HISTORY, rs_global->remark, rs_global->calctime);
-      im_global->adf.labelAdd (Array2dFileLabel::L_HISTORY, remark, calctime);
-      im_global->adf.fileClose ();
+      im_global->arrayDataWrite ();
+      im_global->labelAdd (Array2dFileLabel::L_HISTORY, rs_global->remark, rs_global->calctime);
+      im_global->labelAdd (Array2dFileLabel::L_HISTORY, remark, calctime);
+      im_global->fileClose ();
       if (opt_verbose)
        cout << "Time active = " << calctime << " sec" << endl;
     }