X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Fprojections.cpp;h=8f1edf7b4e7f8ed32757b0c522cae49264784751;hb=30e455abcd8cac05ce7afe43216ec9e26342e1cf;hp=cd151be0e18013b9936bd0103ecc7822ef832857;hpb=08f34bf3ba14d4f436f4d2ef0ee5af1d6eb266ac;p=ctsim.git

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index cd151be..8f1edf7 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.5 2000/06/25 17:32:24 kevin Exp $
+**  $Id: projections.cpp,v 1.13 2000/07/11 10:32:44 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
@@ -132,18 +132,26 @@ Projections::deleteProjData (void)
 
 
 /* NAME
- *    projections_write_header         Write data header for projections file
+ *    Projections::headerWwrite         Write data header for projections file
  *
  */
 
 bool 
 Projections::headerWrite (fnetorderstream& fs)
 {
-  kuint32 _hsize = m_headerSize;
+  kuint16 _hsize = m_headerSize;
+  kuint16 _signature = m_signature;
   kuint32 _nView = m_nView;
   kuint32 _nDet = m_nDet;
   kuint32 _geom = m_geometry;
-  kuint32 _remarksize = m_remark.length();
+  kuint16 _remarksize = m_remark.length();
+  kuint16 _year = m_year;
+  kuint16 _month = m_month;
+  kuint16 _day = m_day;
+  kuint16 _hour = m_hour;
+  kuint16 _minute = m_minute;
+  kuint16 _second = m_second;
+
   kfloat64 _calcTime = m_calcTime;
   kfloat64 _rotStart = m_rotStart;
   kfloat64 _rotInc = m_rotInc;
@@ -155,7 +163,8 @@ Projections::headerWrite (fnetorderstream& fs)
   if (! fs)
     return false;
 
-  fs.writeInt32 (_hsize);
+  fs.writeInt16 (_hsize);
+  fs.writeInt16 (_signature);
   fs.writeInt32 (_nView);
   fs.writeInt32 (_nDet);
   fs.writeInt32 (_geom);
@@ -165,13 +174,19 @@ Projections::headerWrite (fnetorderstream& fs)
   fs.writeFloat64 (_detStart);
   fs.writeFloat64 (_detInc);
   fs.writeFloat64 (_phmLen);
-  fs.writeInt32 (_remarksize);
+  fs.writeInt16 (_year);
+  fs.writeInt16 (_month);
+  fs.writeInt16 (_day);
+  fs.writeInt16 (_hour);
+  fs.writeInt16 (_minute);
+  fs.writeInt16 (_second);
+  fs.writeInt16 (_remarksize);
   fs.write (m_remark.c_str(), _remarksize);
 
   m_headerSize = fs.tellp();
   _hsize = m_headerSize;
   fs.seekp(0);
-  fs.writeInt32 (_hsize);
+  fs.writeInt16 (_hsize);
   if (! fs)
       return false;
   
@@ -185,24 +200,17 @@ Projections::headerWrite (fnetorderstream& fs)
 bool
 Projections::headerRead (fnetorderstream& fs)
 {
-  kuint32 _hsize;
-  kuint32 _nView;
-  kuint32 _nDet;
-  kuint32 _geom;
-  kuint32 _remarksize = 0;
-  kfloat64 _calcTime;
-  kfloat64 _rotStart;
-  kfloat64 _rotInc;
-  kfloat64 _detStart;
-  kfloat64 _detInc;
-  kfloat64 _phmLen;
+  kuint16 _hsize, _signature, _year, _month, _day, _hour, _minute, _second, _remarksize = 0;
+  kuint32 _nView, _nDet, _geom;
+  kfloat64 _calcTime, _rotStart, _rotInc, _detStart, _detInc, _phmLen;
   
   fs.seekg(0);
   if (! fs)
       return false;
 
   off_t testPos;
-  fs.readInt32 (_hsize);
+  fs.readInt16 (_hsize);
+  fs.readInt16 (_signature);
   fs.readInt32 (_nView);
   fs.readInt32 (_nDet);
   fs.readInt32 (_geom);
@@ -212,17 +220,24 @@ Projections::headerRead (fnetorderstream& fs)
   fs.readFloat64 (_detStart);
   fs.readFloat64 (_detInc);
   fs.readFloat64 (_phmLen);
-  fs.readInt32 (_remarksize);
-  if (_remarksize > 100000) {
-    sys_error (ERR_SEVERE, "Insane _remarksize %d [projections::headerRead]", _remarksize);
-    return false;
-  }
+  fs.readInt16 (_year);
+  fs.readInt16 (_month);
+  fs.readInt16 (_day);
+  fs.readInt16 (_hour);
+  fs.readInt16 (_minute);
+  fs.readInt16 (_second);
+  fs.readInt16 (_remarksize);
 
   if (! fs) {
       sys_error (ERR_SEVERE, "Error reading header information , _remarksize=%d [projections_read_header]", _remarksize);
       return false;
   }
 
+  if (_signature != m_signature) {
+    sys_error (ERR_SEVERE, "File %s does not have a valid projection file signature", m_filename.c_str());
+    return false;
+  }
+
   char remarkStorage[_remarksize+1];
   fs.read (remarkStorage, _remarksize);
   if (! fs) {
@@ -248,6 +263,17 @@ Projections::headerRead (fnetorderstream& fs)
   m_detStart = _detStart;
   m_detInc = _detInc;
   m_phmLen = _phmLen;
+  m_year = _year;
+  m_month = _month;
+  m_day = _day;
+  m_hour = _hour;
+  m_minute = _minute;
+  m_second = _second;
+
+  m_label.setLabelType (Array2dFileLabel::L_HISTORY);
+  m_label.setLabelString (m_remark);
+  m_label.setCalcTime (m_calcTime);
+  m_label.setDateTime (m_year, m_month, m_day, m_hour, m_minute, m_second);
 
   return true;
 }
@@ -256,6 +282,7 @@ bool
 Projections::read (const char* filename)
 {
   frnetorderstream fileRead (filename, ios::in | ios::binary);
+  m_filename = filename;
 
   if (! fileRead)
     return false;
@@ -280,11 +307,21 @@ bool
 Projections::write (const char* filename)
 {
   frnetorderstream fs (filename, ios::out | ios::binary | ios::trunc | ios::ate);
-
+  m_filename = filename;
   if (! fs) {
     sys_error (ERR_SEVERE, "Error opening file %s for output [projections_create]", filename);
     return false;
   }
+
+  time_t t = time(NULL);
+  tm* lt = localtime(&t);
+  m_year = lt->tm_year;
+  m_month = lt->tm_mon;
+  m_day = lt->tm_mday;
+  m_hour = lt->tm_hour;
+  m_minute = lt->tm_min;
+  m_second = lt->tm_sec;
+
   if (! headerWrite (fs))
       return false;
 
@@ -450,30 +487,27 @@ Projections::printScanInfo (void) const
  */
 
 bool
-Projections::reconstruct (ImageFile& im, const char* const filterName, double filt_param, 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)
 {
   int nview = m_nView;
-  double det_inc = m_detInc;
-  double detlen = (m_nDet - 1) * det_inc;
-  int n_filtered_proj = m_nDet;
-  double filtered_proj [n_filtered_proj];   // convolved result
+  double detInc = m_detInc;
+  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_filtered_proj = (m_nDet - 1) * (zoom_factor + 1) + 1;
+    n_filteredProj = (m_nDet - 1) * (zoom_factor + 1) + 1;
   }
 #endif
 
-  int n_vec_filter = 2 * m_nDet - 1;
-  double filterBW = 1. / det_inc;
-  double filterMin = -detlen;
-  double filterMax = detlen;
+  double filterBW = 1. / detInc;
+  SignalFilter filter (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", zeropad, interpFactor);
+  filter.setTraceLevel(trace);
 
-  SignalFilter filter (filterName, filterBW, filterMin, filterMax, n_vec_filter, filt_param, "spatial", 0);
   if (filter.fail()) {
       sys_error (ERR_SEVERE, "%s [Projections::reconstruct]", filter.failMessage().c_str());
       return false;
@@ -484,26 +518,29 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
 
 #if HAVE_SGP
   SGP_ID gid;
-  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 = (filterMax - filterMin) / (n_vec_filter - 1);
-    for (i = 0, f = filterMin; i < n_vec_filter; i++, f += filterInc)
+    double filterInc = filter.getFilterIncrement();
+    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, det_inc=%.4f\n", m_nView, m_nDet, m_detStart, m_detInc);
+    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;
@@ -516,8 +553,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
     DetectorArray& darray = getDetectorArray (iview);
     DetectorValue* detval = darray.detValues();
 
-    for (int j = 0; j < m_nDet; j++)
-      filtered_proj[j] = filter.convolve (detval, det_inc, j, m_nDet);
+    filter.filterSignal (detval, filteredProj);
 
 #ifdef HAVE_SGP
     if (trace >= TRACE_PLOT)  {
@@ -538,24 +574,25 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
       ezset  ("xporigin .5.");
       ezset  ("xlength .5.");
       ezset ("box");
+
       ezset ("grid");
-      gid = ezplot (filtered_proj, plot_xaxis, m_nDet);
+      gid = ezplot (filteredProj, plot_xaxis, n_filteredProj);
     }
 #endif  //HAVE_SGP
 
 #ifdef HAVE_BSPLINE_INTERP
     if (interp_type == I_BSPLINE) 
-	bspline (m_nDet, zoom_factor, spline_order, filtered_proj, filtered_proj);
+	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, filtered_proj, filtered_proj);
-      ezplot_1d (filtered_proj, n_filtered_proj);
+	bspline (m_nDet, zoom_factor, spline_order, filteredProj, filteredProj);
+      ezplot_1d (filteredProj, n_filteredProj);
     }
 #endif
 #endif
 
-    bj.BackprojectView (filtered_proj, darray.viewAngle());
+    bj.BackprojectView (filteredProj, darray.viewAngle());
 
 #ifdef HAVE_SGP
     if (trace >= TRACE_PLOT) {