r22: Code cleaning

diff --git a/src/phm2rs.c b/src/phm2rs.c
index 3ed5e97644a0a153ddc6ddb3b1e92d8d7bd5bad5..0612fb945a14834bb80d13652d3b88ad991e58cd 100644 (file)
--- a/src/phm2rs.c
+++ b/src/phm2rs.c
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: phm2rs.c,v 1.5 2000/04/30 10:13:27 kevin Exp $
+**  $Id: phm2rs.c,v 1.6 2000/04/30 18:23:53 kevin Exp $

 **  $Log: phm2rs.c,v $
 **  $Log: phm2rs.c,v $

+**  Revision 1.6  2000/04/30 18:23:53  kevin
+**  Code cleaning
+**

 **  Revision 1.5  2000/04/30 10:13:27  kevin
 **  Fixed MPI bugs
 **
 **  Revision 1.5  2000/04/30 10:13:27  kevin
 **  Fixed MPI bugs
 **


@@ -120,8 +123,8 @@ main (const int argc, char *const argv[])
 {
   DETECTOR *det;
   PICTURE *pic = NULL;
 {
   DETECTOR *det;
   PICTURE *pic = NULL;

-  RAYSUM *rs_global;
-  char str[256], *opt_outfile, opt_desc[MAXREMARK+1];
+  RAYSUM *rs_global = NULL;
+  char str[256], *opt_outfile = NULL, opt_desc[MAXREMARK+1];

   char opt_picfilename[256];
   char *endptr, *endstr;
   int opt_ndet, opt_nview;
   char opt_picfilename[256];
   char *endptr, *endstr;
   int opt_ndet, opt_nview;


@@ -130,12 +133,12 @@ main (const int argc, char *const argv[])
   int opt_verbose = 0;
   int opt_debug = 0;
   double opt_rotangle = 1;
   int opt_verbose = 0;
   int opt_debug = 0;
   double opt_rotangle = 1;

-  double time_start, time_end;
+  double time_start = 0, time_end = 0;

 #ifdef MPI_CT
   RAYSUM *rs_local;
   int mpi_argc = argc;
   char **mpi_argv = (char **) argv;
 #ifdef MPI_CT
   RAYSUM *rs_local;
   int mpi_argc = argc;
   char **mpi_argv = (char **) argv;

-  double mpi_t1, mpi_t2, mpi_t, mpi_t_g;
+  double mpi_t1 = 0, mpi_t2 = 0, mpi_t, mpi_t_g;

 
   MPI_Init(&mpi_argc, &mpi_argv);
   MPI_Comm_dup (MPI_COMM_WORLD, &mpi_ct.comm);
 
   MPI_Init(&mpi_argc, &mpi_argv);
   MPI_Comm_dup (MPI_COMM_WORLD, &mpi_ct.comm);

diff --git a/src/sample-ctrec.sh b/src/sample-ctrec.sh
index 5daa07eeae3024cd5ad6dfdeeabf1188ae3e9eb6..2ef322034e104fbe720122bfb13632d3f242c2f2 100644 (file)
--- a/src/sample-ctrec.sh
+++ b/src/sample-ctrec.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-bin="/opt/ctsim/bin/"
+bin="/usr/local/bin/"

 
 # Generate phantom image
 
 
 # Generate phantom image