** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: projections.cpp,v 1.9 2000/07/03 11:02:06 kevin Exp $
+** $Id: projections.cpp,v 1.15 2000/07/15 08:36:13 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
if (! fs)
return false;
- off_t testPos;
fs.readInt16 (_hsize);
fs.readInt16 (_signature);
fs.readInt32 (_nView);
darray.setViewAngle (view_angle);
// darray.setNDet ( nDet);
- for (int i = 0; i < nDet; i++) {
+ for (unsigned int i = 0; i < nDet; i++) {
kfloat32 detval;
fs.readFloat32 (detval);
detval_ptr[i] = detval;
fs.writeFloat64 (view_angle);
fs.writeInt32 (nDet);
- for (int i = 0; i < nDet; i++) {
+ for (unsigned int i = 0; i < nDet; i++) {
kfloat32 detval = detval_ptr[i];
fs.writeFloat32 (detval);
}
*/
bool
-Projections::reconstruct (ImageFile& im, const char* const filterName, double filt_param, const char* const filterMethodName, const char* const interpName, int interp_param, const char* const backprojectName, const int trace)
+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
{
- int nview = m_nView;
double detInc = m_detInc;
- int n_filteredProj = m_nDet;
+ int n_filteredProj = m_nDet * interpFactor;
double filteredProj [n_filteredProj]; // filtered projections
#ifdef HAVE_BSPLINE_INTERP
int spline_order = 0, zoom_factor = 0;
if (interp_type == I_BSPLINE) {
- zoom_factor = interp_param;
+ zoom_factor = interpFactor;
spline_order = 3;
zoom_factor = 3;
n_filteredProj = (m_nDet - 1) * (zoom_factor + 1) + 1;
#endif
double filterBW = 1. / detInc;
- SignalFilter filter (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", 0);
+ SignalFilter filter (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", zeropad, interpFactor);
+ filter.setTraceLevel(trace);
+
if (filter.fail()) {
sys_error (ERR_SEVERE, "%s [Projections::reconstruct]", filter.failMessage().c_str());
return false;
#if HAVE_SGP
SGP_ID gid;
- int n_vec_filter = filter.getNFilterPoints();
- double plot_xaxis [n_vec_filter]; // array for plotting
+ int nVecFilter = filter.getNFilterPoints();
+ double plot_xaxis [nVecFilter]; // array for plotting
- if (trace > TRACE_TEXT) {
+ if (trace > TRACE_TEXT && nVecFilter > 0) {
int i;
double f;
double filterInc = filter.getFilterIncrement();
- for (i = 0, f = filter.getFilterMin(); i < n_vec_filter; i++, f += filterInc)
+ for (i = 0, f = filter.getFilterMin(); i < nVecFilter; i++, f += filterInc)
plot_xaxis[i] = f;
-
- gid = ezplot (plot_xaxis, filter.getFilter(), n_vec_filter);
- cio_put_str ("Press any key to continue");
- cio_kb_getc ();
- sgp2_close (gid);
+
+ if (filter.getFilter()) {
+ gid = ezplot (plot_xaxis, filter.getFilter(), nVecFilter);
+ cio_put_str ("Press any key to continue");
+ cio_kb_getc ();
+ sgp2_close (gid);
+ }
}
if (trace >= TRACE_TEXT) {
printf ("nview=%d, ndet=%d, det_start=%.4f, detInc=%.4f\n", m_nView, m_nDet, m_detStart, m_detInc);
}
#endif //HAVE_SGP
- Backprojector bj (*this, im, backprojectName, interpName);
+ Backprojector bj (*this, im, backprojectName, interpName, interpFactor);
if (bj.fail()) {
sys_error (ERR_SEVERE, "%s [Projections::reconstruct]", bj.failMessage().c_str());
return false;
if (trace >= TRACE_TEXT)
printf ("Reconstructing view %d (last = %d)\n", iview, m_nView - 1);
- DetectorArray& darray = getDetectorArray (iview);
- DetectorValue* detval = darray.detValues();
+ const DetectorArray& darray = getDetectorArray (iview);
+ const DetectorValue* detval = darray.detValues();
filter.filterSignal (detval, filteredProj);
- // for (int j = 0; j < m_nDet; j++)
- // filteredProj[j] = filter.convolve (detval, detInc, j, m_nDet);
-
#ifdef HAVE_SGP
if (trace >= TRACE_PLOT) {
ezset ("clear.");
ezset ("xporigin .5.");
ezset ("xlength .5.");
ezset ("box");
+
ezset ("grid");
- gid = ezplot (filteredProj, plot_xaxis, m_nDet);
+ gid = ezplot (filteredProj, plot_xaxis, n_filteredProj);
}
#endif //HAVE_SGP