X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fpjrec.cpp;h=427c5a82fc9acd9f65319432467d85089ed4edec;hp=974d62e88b8408225c8859fe62588ce4459ca2fd;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=c8b19dfaffba9f06d8b6c40cb1bb83a8964867f7 diff --git a/tools/pjrec.cpp b/tools/pjrec.cpp index 974d62e..427c5a8 100644 --- a/tools/pjrec.cpp +++ b/tools/pjrec.cpp @@ -50,7 +50,7 @@ static struct option my_options[] = static const char* g_szIdStr = "$Id$"; -void +void pjrec_usage (const char *program) { std::cout << "usage: " << fileBasename(program) << " raysum-file image-file nx-image ny-image [OPTIONS]" << std::endl; @@ -118,7 +118,7 @@ static void ReduceImageMPI (MPIWorld& mpiWorld, ImageFile* imLocal, ImageFile* i #endif -int +int pjrec_main (int argc, char * const argv[]) { Projections projGlobal; @@ -154,99 +154,99 @@ pjrec_main (int argc, char * const argv[]) while (1) { int c = getopt_long(argc, argv, "", my_options, NULL); char *endptr = NULL; - + if (c == -1) - break; - + break; + switch (c) - { - case O_INTERP: - sOptInterpName = optarg; - break; - case O_PREINTERPOLATION_FACTOR: - iOptPreinterpolationFactor = strtol(optarg, &endptr, 10); - if (endptr != optarg + strlen(optarg)) { - pjrec_usage(argv[0]); - return(1); - } - break; - case O_FILTER: - sOptFilterName = optarg; - break; + { + case O_INTERP: + sOptInterpName = optarg; + break; + case O_PREINTERPOLATION_FACTOR: + iOptPreinterpolationFactor = strtol(optarg, &endptr, 10); + if (endptr != optarg + strlen(optarg)) { + pjrec_usage(argv[0]); + return(1); + } + break; + case O_FILTER: + sOptFilterName = optarg; + break; case O_FILTER_METHOD: - sOptFilterMethodName = optarg; + sOptFilterMethodName = optarg; + break; + case O_FILTER_GENERATION: + sOptFilterGenerationName = optarg; + break; + case O_FILTER_PARAM: + dOptFilterParam = strtod(optarg, &endptr); + if (endptr != optarg + strlen(optarg)) { + pjrec_usage(argv[0]); + return(1); + } + break; + case O_ZEROPAD: + iOptZeropad = strtol(optarg, &endptr, 10); + if (endptr != optarg + strlen(optarg)) { + pjrec_usage(argv[0]); + return(1); + } + break; + case O_BACKPROJ: + sOptBackprojectName = optarg; + break; + case O_VERBOSE: + bOptVerbose = true; + break; + case O_DEBUG: + bOptDebug = true; + break; + case O_TRACE: + if ((optTrace = Trace::convertTraceNameToID(optarg)) == Trace::TRACE_INVALID) { + pjrec_usage(argv[0]); + return (1); + } break; - case O_FILTER_GENERATION: - sOptFilterGenerationName = optarg; - break; - case O_FILTER_PARAM: - dOptFilterParam = strtod(optarg, &endptr); - if (endptr != optarg + strlen(optarg)) { - pjrec_usage(argv[0]); - return(1); - } - break; - case O_ZEROPAD: - iOptZeropad = strtol(optarg, &endptr, 10); - if (endptr != optarg + strlen(optarg)) { - pjrec_usage(argv[0]); - return(1); - } - break; - case O_BACKPROJ: - sOptBackprojectName = optarg; - break; - case O_VERBOSE: - bOptVerbose = true; - break; - case O_DEBUG: - bOptDebug = true; - break; - case O_TRACE: - if ((optTrace = Trace::convertTraceNameToID(optarg)) == Trace::TRACE_INVALID) { - pjrec_usage(argv[0]); - return (1); - } - break; case O_VERSION: #ifdef VERSION - std::cout << "Version " << VERSION << std::endl << g_szIdStr << std::endl; + std::cout << "Version " << VERSION << std::endl << g_szIdStr << std::endl; #else std::cout << "Unknown version number" << std::endl; #endif - return (0); - case O_HELP: - case '?': - pjrec_usage(argv[0]); - return (0); - default: - pjrec_usage(argv[0]); - return (1); - } + return (0); + case O_HELP: + case '?': + pjrec_usage(argv[0]); + return (0); + default: + pjrec_usage(argv[0]); + return (1); + } } - + if (optind + 4 != argc) { pjrec_usage(argv[0]); return (1); } pszFilenameProj = argv[optind]; - + pszFilenameImage = argv[optind + 1]; - + nx = strtol(argv[optind + 2], &endptr, 10); ny = strtol(argv[optind + 3], &endptr, 10); - + std::ostringstream filterDesc; if (dOptFilterParam >= 0) - filterDesc << sOptFilterName << ": alpha=" << dOptFilterParam; + filterDesc << sOptFilterName << ": alpha=" << dOptFilterParam; else filterDesc << sOptFilterName; std::ostringstream label; label << "pjrec: " << nx << "x" << ny << ", " << filterDesc.str() << ", " << sOptInterpName << ", preinterpolationFactor=" << iOptPreinterpolationFactor << ", " << sOptBackprojectName; sRemark = label.str(); - + if (bOptVerbose) std::cout << "SRemark: " << sRemark << std::endl; #ifdef HAVE_MPI @@ -332,7 +332,7 @@ pjrec_main (int argc, char * const argv[]) return (1); } reconstruct.reconstructAllViews(); - + if (bOptVerbose) timerReconstruct.timerEndAndReport ("Time to reconstruct"); @@ -358,7 +358,7 @@ pjrec_main (int argc, char * const argv[]) imGlobal->labelAdd (Array2dFileLabel::L_HISTORY, sRemark.c_str(), dCalcTime); imGlobal->fileWrite (pszFilenameImage); if (bOptVerbose) - std::cout << "Run time: " << dCalcTime << " seconds" << std::endl; + std::cout << "Run time: " << dCalcTime << " seconds" << std::endl; } #ifdef HAVE_MPI MPI::Finalize(); @@ -379,14 +379,14 @@ static void ScatterProjectionsMPI (MPIWorld& mpiWorld, Projections& projGlobal, if (mpiWorld.getRank() == 0) { for (int iProc = 0; iProc < mpiWorld.getNumProcessors(); iProc++) { for (int iw = mpiWorld.getStartWorkUnit(iProc); iw <= mpiWorld.getEndWorkUnit(iProc); iw++) { - DetectorArray& detarray = projGlobal.getDetectorArray( iw ); - int nDet = detarray.nDet(); - DetectorValue* detval = detarray.detValues(); - - double viewAngle = detarray.viewAngle(); - mpiWorld.getComm().Send(&nDet, 1, MPI::INT, iProc, 0); - mpiWorld.getComm().Send(&viewAngle, 1, MPI::DOUBLE, iProc, 0); - mpiWorld.getComm().Send(detval, nDet, MPI::FLOAT, iProc, 0); + DetectorArray& detarray = projGlobal.getDetectorArray( iw ); + int nDet = detarray.nDet(); + DetectorValue* detval = detarray.detValues(); + + double viewAngle = detarray.viewAngle(); + mpiWorld.getComm().Send(&nDet, 1, MPI::INT, iProc, 0); + mpiWorld.getComm().Send(&viewAngle, 1, MPI::DOUBLE, iProc, 0); + mpiWorld.getComm().Send(detval, nDet, MPI::FLOAT, iProc, 0); } } } @@ -423,7 +423,7 @@ ReduceImageMPI (MPIWorld& mpiWorld, ImageFile* imLocal, ImageFile* imGlobal) #ifndef NO_MAIN -int +int main (int argc, char* argv[]) { int retval = 1; @@ -431,9 +431,9 @@ main (int argc, char* argv[]) try { retval = pjrec_main(argc, argv); } catch (exception e) { - std::cerr << "Exception: " << e.what() << std::endl; + std::cerr << "Exception: " << e.what() << std::endl; } catch (...) { - std::cerr << "Unknown exception" << std::endl; + std::cerr << "Unknown exception" << std::endl; } return (retval);