X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Fprojections.cpp;h=da298f01622003e1dde47bbc1da6757a51a2cab9;hb=6bfb747f8163381d94a02c03a0351e9ca6815d22;hp=e5d19a37cceafc09cfafb3bd37df7bbd225052bc;hpb=c85a5b31119b4e0903144c55441717a7ad1e0b8b;p=ctsim.git diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp index e5d19a3..da298f0 100644 --- a/libctsim/projections.cpp +++ b/libctsim/projections.cpp @@ -8,7 +8,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: projections.cpp,v 1.17 2000/07/28 10:51:31 kevin Exp $ +** $Id: projections.cpp,v 1.23 2000/08/27 20:32:55 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 @@ -80,9 +80,10 @@ Projections::initFromScanner (const Scanner& scanner) m_phmLen = scanner.phmLen(); m_rotInc = scanner.rotInc(); m_detInc = scanner.detInc(); + m_focalLength = scanner.focalLength(); + m_fieldOfView = scanner.fieldOfView(); m_rotStart = 0; - m_detStart = -scanner.radius() + (scanner.detInc() / 2); - m_phmLen = scanner.phmLen(); + m_detStart = -(scanner.detLen() / 2) + (scanner.detInc() / 2); } void @@ -158,7 +159,9 @@ Projections::headerWrite (fnetorderstream& fs) kfloat64 _detStart = m_detStart; kfloat64 _detInc = m_detInc; kfloat64 _phmLen = m_phmLen; - + kfloat64 _fieldOfView = m_fieldOfView; + kfloat64 _focalLength = m_focalLength; + fs.seekp(0); if (! fs) return false; @@ -174,6 +177,8 @@ Projections::headerWrite (fnetorderstream& fs) fs.writeFloat64 (_detStart); fs.writeFloat64 (_detInc); fs.writeFloat64 (_phmLen); + fs.writeFloat64 (_focalLength); + fs.writeFloat64 (_fieldOfView); fs.writeInt16 (_year); fs.writeInt16 (_month); fs.writeInt16 (_day); @@ -202,7 +207,7 @@ Projections::headerRead (fnetorderstream& fs) { kuint16 _hsize, _signature, _year, _month, _day, _hour, _minute, _second, _remarksize = 0; kuint32 _nView, _nDet, _geom; - kfloat64 _calcTime, _rotStart, _rotInc, _detStart, _detInc, _phmLen; + kfloat64 _calcTime, _rotStart, _rotInc, _detStart, _detInc, _phmLen, _focalLength, _fieldOfView; fs.seekg(0); if (! fs) @@ -219,6 +224,8 @@ Projections::headerRead (fnetorderstream& fs) fs.readFloat64 (_detStart); fs.readFloat64 (_detInc); fs.readFloat64 (_phmLen); + fs.readFloat64 (_focalLength); + fs.readFloat64 (_fieldOfView); fs.readInt16 (_year); fs.readInt16 (_month); fs.readInt16 (_day); @@ -262,6 +269,8 @@ Projections::headerRead (fnetorderstream& fs) m_detStart = _detStart; m_detInc = _detInc; m_phmLen = _phmLen; + m_focalLength = _focalLength; + m_fieldOfView = _fieldOfView; m_year = _year; m_month = _month; m_day = _day; @@ -435,10 +444,10 @@ Projections::printProjectionData (void) { printf("Projections Print\n\n"); printf("Description: %s\n", m_remark.c_str()); - printf("nView = %d nDet = %d\n", m_nView, m_nDet); - printf("rotStart = %8.4f rotInc = %8.4f\n", m_rotStart, m_rotInc); - printf("detStart = %8.4f detInc = %8.4f\n", m_detStart, m_detInc); - + printf("nView = %8d nDet = %8d\n", m_nView, m_nDet); + printf("rotStart = %8.4f rotInc = %8.4f\n", m_rotStart, m_rotInc); + printf("detStart = %8.4f detInc = %8.4f\n", m_detStart, m_detInc); + printf("focalLength = %8.4f fieldOfView = %8.4f\n", m_focalLength, m_fieldOfView); if (m_projData != NULL) { for (int ir = 0; ir < m_nView; ir++) { DetectorValue* detval = m_projData[ir]->detValues(); @@ -486,7 +495,7 @@ Projections::printScanInfo (void) const */ bool -Projections::reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* const interpName, int interpFactor, const char* const backprojectName, const int trace) const +Projections::reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const int zeropad, const char* filterGenerationName, const char* const interpName, int interpFactor, const char* const backprojectName, const int trace) const { double detInc = m_detInc; int n_filteredProj = m_nDet * interpFactor; @@ -503,11 +512,10 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi #endif double filterBW = 1. / detInc; - SignalFilter filter (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", zeropad, interpFactor); - filter.setTraceLevel(trace); + ProcessSignal processSignal (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", filterGenerationName, zeropad, interpFactor, trace, m_geometry); - if (filter.fail()) { - sys_error (ERR_SEVERE, "%s [Projections::reconstruct]", filter.failMessage().c_str()); + if (processSignal.fail()) { + sys_error (ERR_SEVERE, "%s [Projections::reconstruct]", processSignal.failMessage().c_str()); return false; } @@ -515,28 +523,29 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi cout << "Reconstruct: filter="<= TRACE_TEXT) { + if (trace >= Trace::TRACE_CONSOLE) { printf ("nview=%d, ndet=%d, det_start=%.4f, detInc=%.4f\n", m_nView, m_nDet, m_detStart, m_detInc); } #endif //HAVE_SGP @@ -548,62 +557,57 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi } for (int iview = 0; iview < m_nView; iview++) { - if (trace >= TRACE_TEXT) + if (trace >= Trace::TRACE_CONSOLE) printf ("Reconstructing view %d (last = %d)\n", iview, m_nView - 1); const DetectorArray& darray = getDetectorArray (iview); const DetectorValue* detval = darray.detValues(); - filter.filterSignal (detval, filteredProj); + processSignal.filterSignal (detval, filteredProj, iview); + +#ifdef HAVE_BSPLINE_INTERP + if (interp_type == I_BSPLINE) + bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj); + +#ifdef HAVE_SGP + if (trace >= Trace::TRACE_PLOT && interp_type == I_BSPLINE) { + bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj); + ezplot_1d (filteredProj, n_filteredProj); + } +#endif +#endif + + bj.BackprojectView (filteredProj, darray.viewAngle()); #ifdef HAVE_SGP - if (trace >= TRACE_PLOT) { + if (trace >= Trace::TRACE_PLOT) { SGPDriver sgpDriverProj ("Projection"); SGP sgpProj (sgpDriverProj); EZPlot ezplotProj (sgpProj); ezplotProj.ezset ("clear"); + ezplotProj.ezset ("title Filtered Projection"); ezplotProj.ezset ("xticks major 5."); ezplotProj.ezset ("xlabel "); ezplotProj.ezset ("ylabel "); - ezplotProj.ezset ("xlength .5."); + ezplotProj.ezset ("yporigin .5."); + ezplotProj.ezset ("ylength .5."); ezplotProj.ezset ("box."); ezplotProj.ezset ("grid."); - ezplotProj.addCurve (detval, plot_xaxis, m_nDet); + ezplotProj.addCurve (plot_xaxis, detval, m_nDet); ezplotProj.plot(); ezplotProj.ezset ("clear"); ezplotProj.ezset ("xticks major 5."); ezplotProj.ezset ("xlabel "); ezplotProj.ezset ("ylabel "); - ezplotProj.ezset ("xporigin .5."); - ezplotProj.ezset ("xlength .5."); + ezplotProj.ezset ("ylength .5."); ezplotProj.ezset ("box"); ezplotProj.ezset ("grid"); - ezplotProj.addCurve (filteredProj, plot_xaxis, n_filteredProj); + ezplotProj.addCurve (plot_xaxis, filteredProj, n_filteredProj); ezplotProj.plot(); - cout << "Press enter to continue\n"; - cio_kb_getc(); - } -#endif //HAVE_SGP - -#ifdef HAVE_BSPLINE_INTERP - if (interp_type == I_BSPLINE) - bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj); - -#ifdef HAVE_SGP - if (trace >= TRACE_PLOT && interp_type == I_BSPLINE) { - bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj); - ezplot_1d (filteredProj, n_filteredProj); - } -#endif -#endif - - bj.BackprojectView (filteredProj, darray.viewAngle()); -#ifdef HAVE_SGP - if (trace >= TRACE_PLOT) { + cout << "Do you want to exit with current pic (y/n)? " << flush; char str[256]; - printf ("Do you want to exit with current pic (y/n) -- "); fgets(str, sizeof(str), stdin); if (tolower(str[0]) == 'y') { break;