r52: *** empty log message ***

[ctsim.git] / src / phm2rs.c

diff --git a/src/phm2rs.c b/src/phm2rs.c
index 3c4217d1c3e4551e66ad45d5e04152690182c0a0..cf47837ef61df46947ba3c1189ce098f3ebd3ab6 100644 (file)
--- a/src/phm2rs.c
+++ b/src/phm2rs.c
@@ -2,8 +2,17 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2rs.c,v 1.7 2000/05/03 08:49:50 kevin Exp $
+**  $Id: phm2rs.c,v 1.10 2000/05/11 14:07:55 kevin Exp $
 **  $Log: phm2rs.c,v $
+**  Revision 1.10  2000/05/11 14:07:55  kevin
+**  *** empty log message ***
+**
+**  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
 **
@@ -51,16 +60,7 @@
 
 #include "ct.h"
 
-#define O_PHANTOM    1
-#define O_DESC       2
-#define O_NRAY       3
-#define O_ROTANGLE   4
-#define O_TRACE      5
-#define O_VERBOSE    6
-#define O_HELP       7
-#define O_PHMFILE    8
-#define O_DEBUG     10
-#define O_VERSION   11
+enum { O_PHANTOM, O_DESC, O_NRAY, O_ROTANGLE, O_TRACE, O_VERBOSE, O_HELP, O_PHMFILE, O_DEBUG, O_VERSION };
 
 static struct option my_options[] = 
 {
@@ -288,12 +288,12 @@ main (const int argc, char *const argv[])
   MPI_Bcast(&opt_debug, 1, MPI_INT, 0, mpi_ct.comm);
   MPI_Bcast(&opt_trace, 1, MPI_INT, 0, mpi_ct.comm);
 
-  if (mpi_ct.my_rank > 0 && opt_phmnum > 0)
+  if (mpi_ct.my_rank > 0 && opt_phmnum >= 0)
     phm = phm_create (opt_phmnum);
 #endif
 
   opt_rotangle *= PI;
-  det = detect_create (phm, opt_ndet, opt_nview, opt_nray, opt_rotangle);
+  det = detector_create (phm, DETECTOR_PARALLEL, opt_ndet, opt_nview, opt_nray, opt_rotangle);
 
 #ifdef MPI_CT
   mpi_ct_calc_work_units(opt_nview);
@@ -363,13 +363,7 @@ main (const int argc, char *const argv[])
   raysum_close (rs_global);
 #endif
 
-  detect_free (det);
-
-  if (opt_trace >= TRACE_PHM)
-    {
-      crt_set_cpos (1, 1);
-      printf("Finished\n");
-    }
+  detector_free (det);
 
   return (0);
 }