r41: ANSI C changes

[ctsim.git] / src / ctrec.c

diff --git a/src/ctrec.c b/src/ctrec.c
index d2706757f08e25a4bbb972b7392cbd66eed005b8..8015376fff4d3b40507276b68131f560df48181c 100644 (file)
--- a/src/ctrec.c
+++ b/src/ctrec.c
@@ -2,8 +2,20 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctrec.c,v 1.5 2000/04/30 11:41:06 kevin Exp $
+**  $Id: ctrec.c,v 1.9 2000/05/08 20:02:32 kevin Exp $
 **  $Log: ctrec.c,v $
+**  Revision 1.9  2000/05/08 20:02:32  kevin
+**  ANSI C changes
+**
+**  Revision 1.8  2000/05/04 18:16:34  kevin
+**  renamed filter definitions
+**
+**  Revision 1.7  2000/05/03 08:49:50  kevin
+**  Code cleanup
+**
+**  Revision 1.6  2000/05/02 15:31:47  kevin
+**  code cleaning
+**
 **  Revision 1.5  2000/04/30 11:41:06  kevin
 **  Cleaned up debugging code
 **
@@ -47,15 +59,7 @@
 
 #include "ct.h"
 
-#define O_INTERP       1
-#define O_FILTER       2
-#define O_FILTER_PARAM 3
-#define O_BACKPROJ     4
-#define O_VERBOSE      5
-#define O_TRACE        6
-#define O_HELP         7
-#define O_DEBUG        8
-#define O_VERSION      9
+enum {O_INTERP, O_FILTER, O_FILTER_PARAM, O_BACKPROJ, O_VERBOSE, O_TRACE, O_HELP, O_DEBUG, O_VERSION};
 
 static struct option my_options[] =
 {
@@ -106,7 +110,7 @@ usage (const char *program)
   fprintf(stdout,"    --trace        Set tracing to level\n");
   fprintf(stdout,"         none      No tracing (default)\n");
   fprintf(stdout,"         status    Status tracing\n");
-  fprintf(stdout,"         pic       Trace picture\n");
+  fprintf(stdout,"         phm       Trace phantom\n");
   fprintf(stdout,"         rays      Trace allrays\n");
   fprintf(stdout,"         plot      Trace plotting\n");
   fprintf(stdout,"         clipping  Trace clipping\n");
@@ -138,17 +142,17 @@ main (const int argc, char *const argv[])
   int opt_debug = 0;
   int opt_trace = TRACE_NONE;
   double opt_filter_param = 1;
-  int opt_filter = W_A_BANDLIMIT;
+  int opt_filter = FILTER_ABS_BANDLIMIT;
   int opt_interp = I_LINEAR;
   int opt_interp_param = 1;
-  int opt_backproj = O_BPROJ_DIFF2;
+  BackprojType opt_backproj = O_BPROJ_DIFF2;
 #ifdef MPI_CT
   IMAGE *im_local;
   RAYSUM *rs_local;
   int mpi_argc = argc;
   char **mpi_argv = (char **) argv;
   int mpi_nview, mpi_ndet;
-  double mpi_detinc, mpi_rotinc, mpi_piclen;
+  double mpi_detinc, mpi_rotinc, mpi_phmlen;
   double mpi_t1, mpi_t2, mpi_t, mpi_t_g;
   int ix;
 
@@ -236,15 +240,14 @@ main (const int argc, char *const argv[])
     nx = strtol(argv[optind + 2], &endptr, 10);
     ny = strtol(argv[optind + 3], &endptr, 10);
   
-    if (opt_filter == W_G_HAMMING || opt_filter == W_AG_HAMMING)
+    if (opt_filter == FILTER_G_HAMMING || opt_filter == FILTER_ABS_G_HAMMING)
       sprintf (filt_name, "%s: alpha = %.2f",
-              filter_name_of (opt_filter), opt_filter_param); 
+              name_of_filter (opt_filter), opt_filter_param); 
     else
-      sprintf (filt_name, "%s", filter_name_of (opt_filter));
+      sprintf (filt_name, "%s", name_of_filter (opt_filter));
   
-    sprintf (remark,
-            "Reconstruct: %dx%d, %s, %s, %s",
-            nx, ny, filt_name, interp_name_of (opt_interp), name_of_backproj(opt_backproj));
+    sprintf (remark, "Reconstruct: %dx%d, %s, %s, %s",
+            nx, ny, filt_name, name_of_interpolation (opt_interp), name_of_backproj(opt_backproj));
   
     if (opt_verbose)
       fprintf (stdout, "%s\n", remark);
@@ -262,7 +265,7 @@ main (const int argc, char *const argv[])
     mpi_ndet = rs_global->ndet;
     mpi_nview = rs_global->nview;
     mpi_detinc = rs_global->det_inc;
-    mpi_piclen = rs_global->piclen;
+    mpi_phmlen = rs_global->phmlen;
     mpi_rotinc = rs_global->rot_inc;
   }
 
@@ -278,7 +281,7 @@ main (const int argc, char *const argv[])
   MPI_Bcast(&mpi_ndet, 1, MPI_INT, 0, mpi_ct.comm);
   MPI_Bcast(&mpi_nview, 1, MPI_INT, 0, mpi_ct.comm);
   MPI_Bcast(&mpi_detinc, 1, MPI_DOUBLE, 0, mpi_ct.comm);
-  MPI_Bcast(&mpi_piclen, 1, MPI_DOUBLE, 0, mpi_ct.comm);
+  MPI_Bcast(&mpi_phmlen, 1, MPI_DOUBLE, 0, mpi_ct.comm);
   MPI_Bcast(&mpi_rotinc, 1, MPI_DOUBLE, 0, mpi_ct.comm);
   MPI_Bcast(&nx, 1, MPI_INT, 0, mpi_ct.comm);
   MPI_Bcast(&ny, 1, MPI_INT, 0, mpi_ct.comm);
@@ -297,7 +300,7 @@ main (const int argc, char *const argv[])
   rs_local->ndet = mpi_ndet;
   rs_local->nview = mpi_nview;
   rs_local->det_inc = mpi_detinc;
-  rs_local->piclen = mpi_piclen;
+  rs_local->phmlen = mpi_phmlen;
   rs_local->rot_inc = mpi_rotinc;
 
   if (opt_verbose)
@@ -367,7 +370,7 @@ main (const int argc, char *const argv[])
       printf("Time to reduce image = %f secs, max time = %f\n", mpi_t, mpi_t_g);
   }
   if (mpi_ct.my_rank == 0) {
-    strncpy (im_global->remark, remark, MAXREMARK);
+    strncpy (im_global->remark, remark, sizeof(im_global->remark));
     time_end = MPI_Wtime();
     im_global->calctime = time_end - time_start;
     image_save (im_global);
@@ -376,7 +379,7 @@ main (const int argc, char *const argv[])
     }
 #else  
   raysum_close (rs_global);
-  strncpy (im_global->remark, remark, MAXREMARK);
+  strncpy (im_global->remark, remark, sizeof(im_global->remark));
   time_end = td_current_sec();
   im_global->calctime = time_end - time_start;
   image_save (im_global);
@@ -436,7 +439,7 @@ static void print_raysum_info(const RAYSUM *rs)
   printf ("Number of detectors: %d\n", rs->ndet);
   printf ("    Number of views: %d\n", rs->nview);
   printf ("             Remark: %s\n", rs->remark);
-  printf ("             Piclen: %f\n", rs->piclen);
+  printf ("             phmlen: %f\n", rs->phmlen);
   printf ("          det_start: %f\n", rs->det_start);
   printf ("            det_inc: %f\n", rs->det_inc);
   printf ("          rot_start: %f\n", rs->rot_start);