X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctrec.cpp;h=19278c98bbeb2443c3de464edf6fdcb5b9bc59e4;hb=a62ba7c54d39fcf1e469c8df169018fa60ae7c3b;hp=fed86ee0504ebe45c5fa537ed842488133bbc1db;hpb=013445d4e52c07491291289eb32fa325d9f9f8ff;p=ctsim.git diff --git a/src/ctrec.cpp b/src/ctrec.cpp index fed86ee..19278c9 100644 --- a/src/ctrec.cpp +++ b/src/ctrec.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctrec.cpp,v 1.4 2000/06/08 16:43:10 kevin Exp $ +** $Id: ctrec.cpp,v 1.7 2000/06/10 22:33:11 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -46,59 +46,58 @@ static struct option my_options[] = void 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"); - fprintf(stdout,"\n"); - fprintf(stdout," raysum-file Input raysum file\n"); - fprintf(stdout," image-file Output image file in SDF2D format\n"); - fprintf(stdout," nx-image Number of columns in output image\n"); - fprintf(stdout," ny-image Number of rows in output image\n"); - fprintf(stdout," --interp Interpolation method during backprojection\n"); - fprintf(stdout," nearest Nearest neighbor interpolation\n"); - fprintf(stdout," linear Linear interpolation\n"); + cout << "usage: " << kbasename(program) << " raysum-file image-file nx-image ny-image [OPTIONS]" << endl; + cout << "Image reconstruction from raysum projections" << endl; + cout << endl; + cout << " raysum-file Input raysum file" << endl; + cout << " image-file Output image file in SDF2D format" << endl; + cout << " nx-image Number of columns in output image" << endl; + cout << " ny-image Number of rows in output image" << endl; + cout << " --interp Interpolation method during backprojection" << endl; + cout << " nearest Nearest neighbor interpolation" << endl; + cout << " linear Linear interpolation" << endl; #if HAVE_BSPLINE_INTERP - fprintf(stdout," bspline B-spline interpolation\n"); + cout << " bspline B-spline interpolation" << endl; #endif - fprintf(stdout," --filter Filter name\n"); - fprintf(stdout," abs_bandlimit Abs * Bandlimiting (default)\n"); - fprintf(stdout," abs_sinc Abs * Sinc\n"); - fprintf(stdout," abs_cos Abs * Cosine\n"); - fprintf(stdout," abs_hamming Abs * Hamming\n"); - fprintf(stdout," shepp Shepp-Logan\n"); - fprintf(stdout," bandlimit Bandlimiting\n"); - fprintf(stdout," sinc Sinc\n"); - fprintf(stdout," cos Cosine\n"); - fprintf(stdout," triangle Triangle\n"); - fprintf(stdout," hamming Hamming\n"); - fprintf(stdout," --backproj Backprojection Method\n"); - fprintf(stdout," trig Trigometric functions at every point\n"); - fprintf(stdout," table Trigometric functions with precalculated table\n"); - fprintf(stdout," diff Difference method\n"); - fprintf(stdout," diff2 Optimized difference method (default)\n"); - fprintf(stdout," idiff2 Optimized difference method with integer math\n"); - fprintf(stdout," --filter-param Alpha level for Hamming filter\n"); - fprintf(stdout," --trace Set tracing to level\n"); - fprintf(stdout," none No tracing (default)\n"); - fprintf(stdout," text Text level tracing\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"); - fprintf(stdout," --verbose Turn on verbose mode\n"); - fprintf(stdout," --debug Turn on debug mode\n"); - fprintf(stdout," --version Print version\n"); - fprintf(stdout," --help Print this help message\n"); + cout << " --filter Filter name" << endl; + cout << " abs_bandlimit Abs * Bandlimiting (default)" << endl; + cout << " abs_sinc Abs * Sinc" << endl; + cout << " abs_cos Abs * Cosine" << endl; + cout << " abs_hamming Abs * Hamming" << endl; + cout << " shepp Shepp-Logan" << endl; + cout << " bandlimit Bandlimiting" << endl; + cout << " sinc Sinc" << endl; + cout << " cos Cosine" << endl; + cout << " triangle Triangle" << endl; + cout << " hamming Hamming" << endl; + cout << " --backproj Backprojection Method" << endl; + cout << " trig Trigometric functions at every point" << endl; + cout << " table Trigometric functions with precalculated table" << endl; + cout << " diff Difference method" << endl; + cout << " diff2 Optimized difference method (default)" << endl; + cout << " idiff2 Optimized difference method with integer math" << endl; + cout << " --filter-param Alpha level for Hamming filter" << endl; + cout << " --trace Set tracing to level" << endl; + cout << " none No tracing (default)" << endl; + cout << " text Text level tracing" << endl; + cout << " phm Trace phantom" << endl; + cout << " rays Trace allrays" << endl; + cout << " plot Trace plotting" << endl; + cout << " clipping Trace clipping" << endl; + cout << " --verbose Turn on verbose mode" << endl; + cout << " --debug Turn on debug mode" << endl; + cout << " --version Print version" << endl; + cout << " --help Print this help message" << endl; } #ifdef HAVE_MPI -static void mpi_scatter_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int debug); +static void mpi_scatter_rs (MPIWorld& mpiWorld, RAYSUM *rs_global, RAYSUM *rs_local, const int debug); #endif -static void print_raysum_info(const RAYSUM *rs); int -ctrec_main (const int argc, char *const argv[]) +ctrec_main (int argc, char * argv[]) { ImageFile *im_global = NULL; RAYSUM *rs_global = NULL; @@ -119,22 +118,10 @@ ctrec_main (const int argc, char *const argv[]) #ifdef HAVE_MPI ImageFile *im_local; RAYSUM *rs_local; - int mpi_argc = argc; - char **mpi_argv = (char **) argv; int mpi_nview, mpi_ndet; double mpi_detinc, mpi_rotinc, mpi_phmlen; double mpi_t1, mpi_t2, mpi_t, mpi_t_g; - - MPI::Init (mpi_argc, mpi_argv); - mpi_ct.comm = MPI::COMM_WORLD.Dup(); - mpi_ct.nproc = mpi_ct.comm.Get_size(); - mpi_ct.my_rank = mpi_ct.comm.Get_rank(); - - if (mpi_ct.nproc > CT_MPI_MAX_PROCESS) { - sys_error(ERR_FATAL, "Number of mpi processes (%d) exceeds max processes (%d)", - mpi_ct.nproc, CT_MPI_MAX_PROCESS); - exit(1); - } + MPIWorld mpiWorld (argc, argv); #endif #ifdef HAVE_MPI @@ -144,7 +131,7 @@ ctrec_main (const int argc, char *const argv[]) #endif #ifdef HAVE_MPI - if (mpi_ct.my_rank == 0) { + if (mpiWorld.getRank() == 0) { #endif while (1) { int c = getopt_long(argc, argv, "", my_options, NULL); @@ -193,9 +180,9 @@ ctrec_main (const int argc, char *const argv[]) break; case O_VERSION: #ifdef VERSION - fprintf(stdout, "Version %s\n", VERSION); + cout << "Version " << VERSION << endl; #else - fprintf(stderr, "Unknown version number"); + cout << "Unknown version number" << endl; #endif exit(0); case O_HELP: @@ -236,11 +223,11 @@ ctrec_main (const int argc, char *const argv[]) #endif #ifdef HAVE_MPI - if (mpi_ct.my_rank == 0) { + if (mpiWorld.getRank() == 0) { rs_global = raysum_open (rs_name); raysum_read (rs_global); if (opt_verbose) - print_raysum_info(rs_global); + raysum_print_info(rs_global); mpi_ndet = rs_global->ndet; mpi_nview = rs_global->nview; @@ -250,33 +237,32 @@ ctrec_main (const int argc, char *const argv[]) } mpi_t1 = MPI::Wtime(); - mpi_ct.comm.Bcast (&opt_verbose, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&opt_debug, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&opt_trace, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&opt_filter, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&opt_interp, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&opt_filter_param, 1, MPI::DOUBLE, 0); - mpi_ct.comm.Bcast (&opt_interp_param, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&opt_backproj, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&mpi_ndet, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&mpi_nview, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&mpi_detinc, 1, MPI::DOUBLE, 0); - mpi_ct.comm.Bcast (&mpi_phmlen, 1, MPI::DOUBLE, 0); - mpi_ct.comm.Bcast (&mpi_rotinc, 1, MPI::DOUBLE, 0); - mpi_ct.comm.Bcast (&nx, 1, MPI::INT, 0); - mpi_ct.comm.Bcast (&ny, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&opt_verbose, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&opt_debug, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&opt_trace, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&opt_filter, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&opt_interp, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&opt_filter_param, 1, MPI::DOUBLE, 0); + mpiWorld.getComm().Bcast (&opt_interp_param, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&opt_backproj, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&mpi_ndet, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&mpi_nview, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&mpi_detinc, 1, MPI::DOUBLE, 0); + mpiWorld.getComm().Bcast (&mpi_phmlen, 1, MPI::DOUBLE, 0); + mpiWorld.getComm().Bcast (&mpi_rotinc, 1, MPI::DOUBLE, 0); + mpiWorld.getComm().Bcast (&nx, 1, MPI::INT, 0); + mpiWorld.getComm().Bcast (&ny, 1, MPI::INT, 0); if (opt_verbose) { mpi_t2 = MPI::Wtime(); mpi_t = mpi_t2 - mpi_t1; - mpi_ct.comm.Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0); - if (mpi_ct.my_rank == 0) + mpiWorld.getComm().Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0); + if (mpiWorld.getRank() == 0) printf("Time to Bcast vars = %f secs, Max time = %f\n", mpi_t, mpi_t_g); } - mpi_ct_calc_work_units(mpi_nview); - - rs_local = raysum_create (NULL, mpi_ct.local_work_units[mpi_ct.my_rank], mpi_ndet); + mpiWorld.setTotalWorkUnits (mpi_nview); + rs_local = raysum_create (NULL, mpiWorld.getMyLocalWorkUnits(), mpi_ndet); rs_local->ndet = mpi_ndet; rs_local->nview = mpi_nview; rs_local->det_inc = mpi_detinc; @@ -285,18 +271,18 @@ ctrec_main (const int argc, char *const argv[]) if (opt_verbose) mpi_t1 = MPI::Wtime(); - mpi_scatter_rs(rs_global, rs_local, opt_debug); + mpi_scatter_rs(mpiWorld, rs_global, rs_local, opt_debug); if (opt_verbose) { mpi_t2 = MPI::Wtime(); mpi_t = mpi_t2 - mpi_t1; - mpi_ct.comm.Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0); - if (mpi_ct.my_rank == 0) + mpiWorld.getComm().Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0); + if (mpiWorld.getRank() == 0) printf("Time to scatter rs = %f secs, Max time = %f sec\n", mpi_t, mpi_t_g); } - if (mpi_ct.my_rank == 0) { + if (mpiWorld.getRank() == 0) { im_global = new ImageFile (im_filename, nx, ny); - im_global->adf.fileCreate(); + im_global->fileCreate(); } im_local = new ImageFile (nx, ny); @@ -304,10 +290,10 @@ ctrec_main (const int argc, char *const argv[]) rs_global = raysum_open (rs_name); raysum_read (rs_global); if (opt_verbose) - print_raysum_info(rs_global); + raysum_print_info(rs_global); im_global = new ImageFile (im_filename, nx, ny); - im_global->adf.fileCreate(); + im_global->fileCreate(); #endif #ifdef HAVE_MPI @@ -317,8 +303,8 @@ ctrec_main (const int argc, char *const argv[]) mpi_t2 = MPI::Wtime(); mpi_t = mpi_t2 - mpi_t1; - mpi_ct.comm.Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0); - if (mpi_ct.my_rank == 0 && opt_verbose) + mpiWorld.getComm().Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0); + if (mpiWorld.getRank() == 0 && opt_verbose) printf("Time to reconstruct = %f, Max time = %f\n", mpi_t, mpi_t_g); #else proj_reconst (*im_global, rs_global, opt_filter, opt_filter_param, @@ -329,46 +315,45 @@ ctrec_main (const int argc, char *const argv[]) if (opt_verbose) mpi_t1 = MPI::Wtime(); - int nxLocal = im_local->adf.nx(); - int nyLocal = im_local->adf.ny(); + int nxLocal = im_local->nx(); + int nyLocal = im_local->ny(); ImageFileArray vLocal = im_local->getArray(); ImageFileArray vGlobal = NULL; - if (mpi_ct.my_rank == 0) + if (mpiWorld.getRank() == 0) vGlobal = im_global->getArray(); for (int ix = 0; ix < nxLocal; ix++) { void *recvbuf = NULL; - if (mpi_ct.my_rank == 0) + if (mpiWorld.getRank() == 0) recvbuf = vGlobal[ix]; - mpi_ct.comm.Reduce(vLocal[ix], recvbuf, nyLocal, im_local->getMPIDataType(), MPI::SUM, 0); + mpiWorld.getComm().Reduce(vLocal[ix], recvbuf, nyLocal, im_local->getMPIDataType(), MPI::SUM, 0); } if (opt_verbose) { mpi_t2 = MPI::Wtime(); mpi_t = mpi_t2 - mpi_t1; - mpi_ct.comm.Reduce (&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0); - if (mpi_ct.my_rank == 0) + mpiWorld.getComm().Reduce (&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0); + if (mpiWorld.getRank() == 0) printf("Time to reduce image = %f secs, max time = %f\n", mpi_t, mpi_t_g); } - if (mpi_ct.my_rank == 0) + if (mpiWorld.getRank() == 0) time_end = MPI::Wtime(); #else time_end = td_current_sec(); #endif - #ifdef HAVE_MPI - if (mpi_ct.my_rank == 0) + if (mpiWorld.getRank() == 0) #endif { raysum_close (rs_global); double calctime = time_end - time_start; - im_global->adf.arrayDataWrite (); - im_global->adf.labelAdd (Array2dFileLabel::L_HISTORY, rs_global->remark, rs_global->calctime); - im_global->adf.labelAdd (Array2dFileLabel::L_HISTORY, remark, calctime); - im_global->adf.fileClose (); + im_global->arrayDataWrite (); + im_global->labelAdd (Array2dFileLabel::L_HISTORY, rs_global->remark, rs_global->calctime); + im_global->labelAdd (Array2dFileLabel::L_HISTORY, remark, calctime); + im_global->fileClose (); if (opt_verbose) cout << "Time active = " << calctime << " sec" << endl; } @@ -380,61 +365,34 @@ ctrec_main (const int argc, char *const argv[]) return (0); } - #ifdef HAVE_MPI -static void mpi_scatter_rs (RAYSUM *rs_global, RAYSUM *rs_local, const int opt_debug) +static void mpi_scatter_rs (MPIWorld& mpiWorld, RAYSUM *rs_global, RAYSUM *rs_local, const int opt_debug) { - int iproc; - int end_work_unit; - int iw = 0; - - 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; - - for (iw = mpi_ct.start_work_unit[iproc]; iw <= end_work_unit; iw++) { - mpi_ct.comm.Send(&rs_global->view[iw]->ndet, 1, MPI::INT, iproc, 0); - mpi_ct.comm.Send(&rs_global->view[iw]->view_angle, 1, MPI::DOUBLE, iproc, 0); - mpi_ct.comm.Send(rs_global->view[iw]->detval, rs_global->ndet, MPI::FLOAT, iproc, 0); + if (mpiWorld.getRank() == 0) { + for (int iProc = 0; iProc < mpiWorld.getNumProcessors(); iProc++) { + for (int iw = mpiWorld.getStartWorkUnit(iProc); iw <= mpiWorld.getEndWorkUnit(iProc); iw++) { + mpiWorld.getComm().Send(&rs_global->view[iw]->ndet, 1, MPI::INT, iProc, 0); + mpiWorld.getComm().Send(&rs_global->view[iw]->view_angle, 1, MPI::DOUBLE, iProc, 0); + mpiWorld.getComm().Send(rs_global->view[iw]->detval, rs_global->ndet, MPI::FLOAT, iProc, 0); } } } - if (opt_debug) - fprintf(stdout, "Receiving rs data in process %d\n", mpi_ct.my_rank); - - end_work_unit = mpi_ct.local_work_units[mpi_ct.my_rank] - 1; - for (iw = 0; iw <= end_work_unit; iw++) { + for (int iw = 0; iw < mpiWorld.getMyLocalWorkUnits(); iw++) { MPI::Status status; - mpi_ct.comm.Recv(&rs_local->view[iw]->ndet, 1, MPI::INT, 0, 0, status); - mpi_ct.comm.Recv(&rs_local->view[iw]->view_angle, 1, MPI::DOUBLE, 0, 0, status); - mpi_ct.comm.Recv(rs_local->view[iw]->detval, rs_local->ndet, MPI::FLOAT, 0, 0, status); - } - rs_local->nview = mpi_ct.local_work_units[mpi_ct.my_rank]; - if (opt_debug) { - mpi_ct.comm.Barrier(); - fprintf(stdout, "Done with mpi_scatter_rs in process %2d\n", mpi_ct.my_rank); + mpiWorld.getComm().Recv(&rs_local->view[iw]->ndet, 1, MPI::INT, 0, 0, status); + mpiWorld.getComm().Recv(&rs_local->view[iw]->view_angle, 1, MPI::DOUBLE, 0, 0, status); + mpiWorld.getComm().Recv(rs_local->view[iw]->detval, rs_local->ndet, MPI::FLOAT, 0, 0, status); } + rs_local->nview = mpiWorld.getMyLocalWorkUnits(); } #endif -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 (" 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); -} - #ifndef NO_MAIN int -main (const int argc, char *const argv[]) +main (int argc, char* argv[]) { return (ctrec_main(argc, argv)); }