X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctrec.c;h=8b6645957d63c02321806bf77d403ab92217263f;hb=cda35cc393bfef9a53de1a5c611e09992fb77022;hp=adfc2f1578e2cb6cf35bf23243cd53c78d9136bd;hpb=34a2efcc5686600698897d2a5908acc061b0ff9f;p=ctsim.git diff --git a/src/ctrec.c b/src/ctrec.c index adfc2f1..8b66459 100644 --- a/src/ctrec.c +++ b/src/ctrec.c @@ -2,8 +2,20 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctrec.c,v 1.3 2000/04/30 04:06:13 kevin Exp $ +** $Id: ctrec.c,v 1.7 2000/05/03 08:49:50 kevin Exp $ ** $Log: ctrec.c,v $ +** Revision 1.7 2000/05/03 08:49:50 kevin +** Code cleanup +** +** Revision 1.6 2000/05/02 15:31:47 kevin +** code cleaning +** +** Revision 1.5 2000/04/30 11:41:06 kevin +** Cleaned up debugging code +** +** Revision 1.4 2000/04/30 10:13:27 kevin +** Fixed MPI bugs +** ** 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 @@ -100,7 +112,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"); @@ -142,7 +154,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; @@ -232,13 +244,13 @@ main (const int argc, char *const argv[]) if (opt_filter == W_G_HAMMING || opt_filter == W_AG_HAMMING) sprintf (filt_name, "%s: alpha = %.2f", - filter_name_of (opt_filter), opt_filter_param); + name_of_filter (opt_filter), opt_filter_param); else - sprintf (filt_name, "%s", filter_name_of (opt_filter)); + sprintf (filt_name, "%s", name_of_filter (opt_filter)); sprintf (remark, "Reconstruct: %dx%d, %s, %s, %s", - nx, ny, filt_name, interp_name_of (opt_interp), name_of_backproj(opt_backproj)); + nx, ny, filt_name, name_of_interpolation (opt_interp), name_of_backproj(opt_backproj)); if (opt_verbose) fprintf (stdout, "%s\n", remark); @@ -250,17 +262,13 @@ main (const int argc, char *const argv[]) if (mpi_ct.my_rank == 0) { rs_global = raysum_open (rs_name); raysum_read (rs_global); - print_raysum_info(rs_global); - if (opt_verbose) { - printf ("Number of detectors: %d\n", rs_global->ndet); - printf (" Number of views: %d\n", rs_global->nview); - printf (" Remark: %s\n", rs_global->remark); - } - + if (opt_verbose) + print_raysum_info(rs_global); + 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; } @@ -276,7 +284,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); @@ -290,22 +298,12 @@ main (const int argc, char *const argv[]) mpi_ct_calc_work_units(mpi_nview); - if (opt_debug) { - fprintf(stdout, "Calc'd local work units process %d: nviews=%d, local_work_units=%d, start_work_units=%d\n", - mpi_ct.my_rank, mpi_nview, mpi_ct.local_work_units[mpi_ct.my_rank], mpi_ct.start_work_unit[mpi_ct.my_rank]); - MPI_Barrier(mpi_ct.comm); - } - rs_local = raysum_create (NULL, mpi_ct.local_work_units[mpi_ct.my_rank], mpi_ndet); - if (opt_debug) { - fprintf(stdout, "Created rs_local %lx for process %d: local views=%4d, local dets=%4d\n", (unsigned long int) rs_local, mpi_ct.my_rank, mpi_ct.local_work_units[mpi_ct.my_rank], mpi_ndet); - MPI_Barrier(mpi_ct.comm); - } 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) @@ -329,7 +327,7 @@ main (const int argc, char *const argv[]) #else rs_global = raysum_open (rs_name); raysum_read (rs_global); - if (opt_debug) + if (opt_verbose) print_raysum_info(rs_global); im_global = image_create (im_filename, nx, ny); @@ -344,9 +342,8 @@ main (const int argc, char *const argv[]) mpi_t2 = MPI_Wtime(); mpi_t = mpi_t2 - mpi_t1; MPI_Reduce(&mpi_t, &mpi_t_g, 1, MPI_DOUBLE, MPI_MAX, 0, mpi_ct.comm); - if (mpi_ct.my_rank == 0) { + if (mpi_ct.my_rank == 0 && opt_verbose) printf("Time to reconstruct = %f, Max time = %f\n", mpi_t, mpi_t_g); - } #else image_reconst (im_global, rs_global, opt_filter, opt_filter_param, opt_interp, opt_interp_param, opt_backproj, opt_trace); @@ -359,10 +356,15 @@ main (const int argc, char *const argv[]) if (opt_verbose) mpi_t1 = MPI_Wtime(); + for (ix = 0; ix < im_local->nx; ix++) { - MPI_Reduce(im_local->v[ix], im_global->v[ix], - im_local->ny, MPI_FLOAT, MPI_SUM, 0, mpi_ct.comm); + void *recvbuf = NULL; + if (mpi_ct.my_rank == 0) + recvbuf = im_global->v[ix]; + + MPI_Reduce(im_local->v[ix], recvbuf, im_local->ny, MPI_FLOAT, MPI_SUM, 0, mpi_ct.comm); } + if (opt_verbose) { mpi_t2 = MPI_Wtime(); mpi_t = mpi_t2 - mpi_t1; @@ -372,19 +374,18 @@ main (const int argc, char *const argv[]) } if (mpi_ct.my_rank == 0) { strncpy (im_global->remark, remark, MAXREMARK); - image_save (im_global); 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, MAXREMARK); - image_save (im_global); - 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 @@ -406,16 +407,9 @@ static void mpi_scatter_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int opt_d if (mpi_ct.my_rank == 0) { for (iproc = 0; iproc < mpi_ct.nproc; iproc++) { - end_work_unit = mpi_ct.start_work_unit[iproc] - + mpi_ct.local_work_units[iproc] - - 1; - - if (opt_debug) - fprintf(stdout, "Sending rs data to process %d\n", iproc); + end_work_unit = mpi_ct.start_work_unit[iproc] + mpi_ct.local_work_units[iproc] - 1; for (iw = mpi_ct.start_work_unit[iproc]; iw <= end_work_unit; iw++) { - if (opt_debug) - fprintf(stdout, "Sending from process %2d to process %2d: view_angle=%8f, ndet=%5d\n", mpi_ct.my_rank, iproc, rs_global->view[iw]->view_angle, rs_global->view[iw]->ndet); MPI_Send(&rs_global->view[iw]->ndet, 1, MPI_INT, iproc, 0, mpi_ct.comm); MPI_Send(&rs_global->view[iw]->view_angle, 1, MPI_DOUBLE, iproc, 0, mpi_ct.comm); MPI_Send(rs_global->view[iw]->detval, rs_global->ndet, MPI_FLOAT, iproc, 0, mpi_ct.comm); @@ -423,33 +417,21 @@ static void mpi_scatter_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int opt_d } } - if (opt_debug) { + if (opt_debug) fprintf(stdout, "Receiving rs data in process %d\n", mpi_ct.my_rank); - MPI_Barrier(mpi_ct.comm); - } end_work_unit = mpi_ct.local_work_units[mpi_ct.my_rank] - 1; for (iw = 0; iw <= end_work_unit; iw++) { MPI_Status status; - if (opt_debug) { - fprintf(stdout,"Receiving into rs_local from mpi_scatter_rs, process %2d: rs_local=%lx, ", mpi_ct.my_rank, (unsigned long int) rs_local); - 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_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); - } } rs_local->nview = mpi_ct.local_work_units[mpi_ct.my_rank]; if (opt_debug) { MPI_Barrier(MPI_COMM_WORLD); fprintf(stdout, "Done with mpi_scatter_rs in process %2d\n", mpi_ct.my_rank); - exit(0); } } @@ -460,9 +442,9 @@ 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 ("det_start: %f\n", rs->det_start); - printf ("det_inc: %f\n", rs->det_inc); - printf ("rot_start: %f\n", rs->rot_start); - printf ("rot_inc: %f\n", rs->rot_inc); + 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); + printf (" rot_inc: %f\n", rs->rot_inc); }