r14: Update Raysum i/o routines

Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global

diff --git a/src/ctrec.c b/src/ctrec.c
index 3c9138724fecc79cb2879a4ba56af41a281b64b3..adfc2f1578e2cb6cf35bf23243cd53c78d9136bd 100644 (file)
--- a/src/ctrec.c
+++ b/src/ctrec.c
@@ -2,8 +2,12 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctrec.c,v 1.2 2000/04/29 23:24:56 kevin Exp $
+**  $Id: ctrec.c,v 1.3 2000/04/30 04:06:13 kevin Exp $
 **  $Log: ctrec.c,v $
+**  Revision 1.3  2000/04/30 04:06:13  kevin
+**  Update Raysum i/o routines
+**  Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global
+**
 **  Revision 1.2  2000/04/29 23:24:56  kevin
 **  *** empty log message ***
 **
@@ -433,9 +437,9 @@ static void mpi_scatter_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int opt_d
       fprintf(stdout,"iw=%4d, nrot=%4d, ndet=%4d, view=%lx, detval=%lx\n", iw, rs_local->nview, rs_local->ndet, (unsigned long int) rs_local->view[iw], (unsigned long int) rs_local->view[iw]->detval);
     }
 
-    // MPI_Recv(&rs_local->view[iw]->ndet, 1, MPI_INT, 0, 0, mpi_ct.comm, &status);
-    // MPI_Recv(&rs_local->view[iw]->view_angle, 1, MPI_DOUBLE, 0, 0, mpi_ct.comm, &status);
-    //    MPI_Recv(rs_local->view[iw]->detval, rs_global->ndet, MPI_FLOAT, 0, 0, mpi_ct.comm, &status);
+    MPI_Recv(&rs_local->view[iw]->ndet, 1, MPI_INT, 0, 0, mpi_ct.comm, &status);
+    MPI_Recv(&rs_local->view[iw]->view_angle, 1, MPI_DOUBLE, 0, 0, mpi_ct.comm, &status);
+    MPI_Recv(rs_local->view[iw]->detval, rs_local->ndet, MPI_FLOAT, 0, 0, mpi_ct.comm, &status);
 
     if (opt_debug) {
       fprintf(stdout, "Received view_angle=%8f, ndet=%5d\n", rs_local->view[iw]->view_angle, rs_local->view[iw]->ndet);

diff --git a/src/phm2rs.c b/src/phm2rs.c
index 1f28679fec2d03489a954a0f69163ac962ee4303..8c9d450378f2b4ab9336f0b6b463d2142f44b000 100644 (file)
--- a/src/phm2rs.c
+++ b/src/phm2rs.c
@@ -2,8 +2,12 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2rs.c,v 1.3 2000/04/29 23:24:56 kevin Exp $
+**  $Id: phm2rs.c,v 1.4 2000/04/30 04:06:13 kevin Exp $
 **  $Log: phm2rs.c,v $
+**  Revision 1.4  2000/04/30 04:06:13  kevin
+**  Update Raysum i/o routines
+**  Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global
+**
 **  Revision 1.3  2000/04/29 23:24:56  kevin
 **  *** empty log message ***
 **
@@ -140,9 +144,6 @@ main (const int argc, char *const argv[])
              mpi_ct.nproc, MPI_MAX_PROCESS);
     exit(1);
   }
-#endif
-
-#ifdef MPI_CT
   time_start = MPI_Wtime();
 #else
   time_start = td_current_sec();

diff --git a/src/phm2sdf.c b/src/phm2sdf.c
index 1a2852a8e173a51fa8da5a97c84f659f0ebc6205..ebc21b6b9494de87de3f4dfc1db6b4ef7cfbcbb2 100644 (file)
--- a/src/phm2sdf.c
+++ b/src/phm2sdf.c
@@ -2,8 +2,12 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2sdf.c,v 1.3 2000/04/28 18:19:01 kevin Exp $
+**  $Id: phm2sdf.c,v 1.4 2000/04/30 04:06:13 kevin Exp $
 **  $Log: phm2sdf.c,v $
+**  Revision 1.4  2000/04/30 04:06:13  kevin
+**  Update Raysum i/o routines
+**  Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global
+**
 **  Revision 1.3  2000/04/28 18:19:01  kevin
 **  removed unused files
 **
@@ -131,12 +135,12 @@ main (const int argc, char *const argv[])
   int opt_picnum = -1;
   int opt_filter = -1;
   int opt_filter_domain = D_SPATIAL;
-  char *opt_outfile;
+  char *opt_outfile = NULL;
   int opt_debug = 0;
   char str[256];
   char opt_desc[256], opt_picfilename[256];
   char *endstr, *endptr;
-  double opt_filter_param;
+  double opt_filter_param = 1;
   double opt_filter_bw = 1.;
   int opt_trace = TRACE_NONE;
   int opt_verbose = 0;