r38: renamed filter definitions

[ctsim.git] / src / ctrec.c

diff --git a/src/ctrec.c b/src/ctrec.c
index 2e53770215afe3a1039b8875c4e5c84b78da9e6c..fb23af9f456ea3a7fbf9270d790a2d180edd6985 100644 (file)
--- a/src/ctrec.c
+++ b/src/ctrec.c
@@ -2,8 +2,14 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctrec.c,v 1.6 2000/05/02 15:31:47 kevin Exp $
+**  $Id: ctrec.c,v 1.8 2000/05/04 18:16:34 kevin Exp $
 **  $Log: ctrec.c,v $
+**  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
 **
@@ -109,7 +115,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");
@@ -141,7 +147,7 @@ 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;
@@ -151,7 +157,7 @@ main (const int argc, char *const argv[])
   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;
 
@@ -239,7 +245,7 @@ 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",
               name_of_filter (opt_filter), opt_filter_param); 
     else
@@ -265,7 +271,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;
   }
 
@@ -281,7 +287,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);
@@ -300,7 +306,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)
@@ -439,7 +445,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);