X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctrec.c;fp=src%2Fctrec.c;h=a643d16f343378f13f1be5b7196ae137e8b25be7;hb=c95a927599e20c3d7762073450e3126d9694107d;hp=1843d3123f48b2721a2b1280fe1150cb057e7f5d;hpb=1e8e203f6b646a69235589d3b8f931da12e77b91;p=ctsim.git

diff --git a/src/ctrec.c b/src/ctrec.c
index 1843d31..a643d16 100644
--- a/src/ctrec.c
+++ b/src/ctrec.c
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctrec.c,v 1.10 2000/05/11 01:06:30 kevin Exp $
+**  $Id: ctrec.c,v 1.11 2000/05/16 04:33:59 kevin Exp $
 **  $Log: ctrec.c,v $
+**  Revision 1.11  2000/05/16 04:33:59  kevin
+**  Improved option processing
+**
 **  Revision 1.10  2000/05/11 01:06:30  kevin
 **  Changed sprintf to snprintf
 **
@@ -79,7 +82,7 @@ static struct option my_options[] =
 };
 
 void 
-usage (const char *program)
+ctrec_usage (const char *program)
 {
   fprintf(stdout,"usage: %s raysum-file image-file nx-image ny-image [OPTIONS]\n", kbasename(program));
   fprintf(stdout,"Image reconstruction from raysum projections\n");
@@ -121,17 +124,17 @@ usage (const char *program)
   fprintf(stdout,"    --debug        Turn on debug mode\n");
   fprintf(stdout,"    --version      Print version\n");
   fprintf(stdout,"    --help         Print this help message\n");
-  exit(1);  
 }
 
 
 #ifdef MPI_CT
 static void mpi_scatter_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int debug);
 #endif
+
 static void print_raysum_info(const RAYSUM *rs);
 
 int 
-main (const int argc, char *const argv[])
+ctrec_main (const int argc, char *const argv[])
 {
   IMAGE *im_global = NULL;
   RAYSUM *rs_global = NULL;
@@ -190,19 +193,27 @@ main (const int argc, char *const argv[])
       switch (c)
 	{
 	case O_INTERP:
-	  opt_interp = opt_set_interpolation(optarg, argv[0]);
+	  if ((opt_interp = opt_set_interpolation(optarg)) < 0) {
+	    ctrec_usage(argv[0]);
+	    return (1);
+	  }
 	  break;
 	case O_FILTER:
-	  opt_filter = opt_set_filter(optarg, argv[0]);
+	  if ((opt_filter = opt_set_filter(optarg)) < 0) {
+	    ctrec_usage(argv[0]);
+	    return (1);
+	  }
 	  break;
 	case O_BACKPROJ:
-	  opt_backproj = opt_set_backproj(optarg, argv[0]);
+	  if ((opt_backproj = opt_set_backproj(optarg)) < 0) {
+	      ctrec_usage(argv[0]);
+	      return (1);
+	  }
 	  break;
 	case O_FILTER_PARAM:
 	  opt_filter_param = strtod(optarg, &endptr);
 	  if (endptr != optarg + strlen(optarg)) {
-	    usage(argv[0]);
-	    exit(1);
+	    ctrec_usage(argv[0]);
 	  }
 	  break;
 	case O_VERBOSE:
@@ -212,7 +223,10 @@ main (const int argc, char *const argv[])
 	  opt_debug = 1;
 	  break;
 	case O_TRACE:
-	  opt_trace = opt_set_trace(optarg, argv[0]);
+	  if ((opt_trace = opt_set_trace(optarg)) < 0) {
+	    ctrec_usage(argv[0]);
+	    return (1);
+	  }
 	  break;
         case O_VERSION:
 #ifdef VERSION
@@ -223,17 +237,17 @@ main (const int argc, char *const argv[])
 	  exit(0);
 	case O_HELP:
 	case '?':
-	  usage(argv[0]);
-	  exit(0);
+	  ctrec_usage(argv[0]);
+	  return (0);
 	default:
-	  usage(argv[0]);
-	  exit(1);
+	  ctrec_usage(argv[0]);
+	  return (1);
 	}
     }
   
     if (optind + 4 != argc) {
-      usage(argv[0]);
-      exit(1);
+      ctrec_usage(argv[0]);
+      return (1);
     }
 
     rs_name = argv[optind];
@@ -350,10 +364,6 @@ main (const int argc, char *const argv[])
 #endif
 
 #ifdef MPI_CT
-  if (mpi_ct.my_rank == 0) {
-    raysum_close (rs_global);
-  }
-
   if (opt_verbose)
     mpi_t1 = MPI_Wtime();
 
@@ -372,24 +382,26 @@ main (const int argc, char *const argv[])
     if (mpi_ct.my_rank == 0)
       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, sizeof(im_global->remark));
-    time_end = MPI_Wtime();
-    im_global->calctime = time_end - time_start;
-    image_save (im_global);
-    if (opt_verbose)
-      fprintf (stdout, "Time active = %.2f\n", im_global->calctime);
-    }
-#else  
-  raysum_close (rs_global);
-  strncpy (im_global->remark, remark, sizeof(im_global->remark));
+
+  if (mpi_ct.my_rank == 0)
+      time_end = MPI_Wtime();
+#else
   time_end = td_current_sec();
-  im_global->calctime = time_end - time_start;
-  image_save (im_global);
-  if (opt_verbose)
-    fprintf (stdout, "Time active = %.2f secs\n", im_global->calctime);
 #endif
 
+
+#ifdef MPI_CT
+  if (mpi_ct.my_rank == 0)
+#endif
+    {
+      raysum_close (rs_global);
+      strncpy (im_global->remark, remark, sizeof(im_global->remark));
+      im_global->calctime = time_end - time_start;
+      image_save (im_global);
+      if (opt_verbose)
+	  fprintf (stdout, "Time active = %.2f\n", im_global->calctime);
+    }
+
 #ifdef MPI_CT
 	MPI_Finalize();
 #endif
@@ -448,3 +460,12 @@ static void print_raysum_info(const RAYSUM *rs)
   printf ("          rot_start: %f\n", rs->rot_start);
   printf ("            rot_inc: %f\n", rs->rot_inc);
 }
+
+#ifndef NO_MAIN
+int 
+main (const int argc, char *const argv[])
+{
+  return (ctrec_main(argc, argv));
+}
+#endif
+