X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fprojections.cpp;h=da298f01622003e1dde47bbc1da6757a51a2cab9;hp=df7ccd2b03b380372eea0124e471aa8711066cd0;hb=6bfb747f8163381d94a02c03a0351e9ca6815d22;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10 diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp index df7ccd2..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.22 2000/08/25 15:59:13 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,6 +80,8 @@ 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.detLen() / 2) + (scanner.detInc() / 2); } @@ -157,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; @@ -173,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); @@ -201,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) @@ -218,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); @@ -261,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; @@ -434,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(); @@ -502,7 +512,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi #endif double filterBW = 1. / detInc; - ProcessSignal processSignal (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", filterGenerationName, zeropad, interpFactor, trace); + ProcessSignal processSignal (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", filterGenerationName, zeropad, interpFactor, trace, m_geometry); if (processSignal.fail()) { sys_error (ERR_SEVERE, "%s [Projections::reconstruct]", processSignal.failMessage().c_str()); @@ -516,7 +526,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi int nVecFilter = processSignal.getNFilterPoints(); double plot_xaxis [nVecFilter]; // array for plotting - if (trace > TRACE_TEXT && nVecFilter > 0) { + if (trace > Trace::TRACE_CONSOLE && nVecFilter > 0) { int i; double f; double filterInc = processSignal.getFilterIncrement(); @@ -535,7 +545,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi cio_kb_getc (); } } - if (trace >= 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 @@ -547,20 +557,20 @@ 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(); - processSignal.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_PLOT && interp_type == I_BSPLINE) { + if (trace >= Trace::TRACE_PLOT && interp_type == I_BSPLINE) { bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj); ezplot_1d (filteredProj, n_filteredProj); } @@ -570,7 +580,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi 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);