X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fprojections.cpp;h=be8e82941f9a47b30fe1946905fa9fba96bc7f0c;hp=da298f01622003e1dde47bbc1da6757a51a2cab9;hb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3;hpb=6bfb747f8163381d94a02c03a0351e9ca6815d22

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index da298f0..be8e829 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.23 2000/08/27 20:32:55 kevin Exp $
+**  $Id: projections.cpp,v 1.24 2000/08/31 08:38:58 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,10 +80,17 @@ Projections::initFromScanner (const Scanner& scanner)
   m_phmLen = scanner.phmLen();
   m_rotInc = scanner.rotInc();
   m_detInc = scanner.detInc();
+  m_geometry = scanner.geometry();
   m_focalLength = scanner.focalLength();
   m_fieldOfView = scanner.fieldOfView();
   m_rotStart = 0;
-  m_detStart =  -(scanner.detLen() / 2) + (scanner.detInc() / 2);
+  m_detStart =  -(scanner.detLen() / 2);
+#if 0
+  if (m_geometry == Scanner::GEOMETRY_EQUILINEAR) {
+    m_detInc /= 2;
+    cout << "Kludge: detInc /= 2 in Projections::initFromScanner" << endl;
+  }
+#endif
 }
 
 void
@@ -286,6 +293,13 @@ Projections::headerRead (fnetorderstream& fs)
   return true;
 }
 
+bool
+Projections::read (const string& filename)
+{
+  return read (filename.c_str());
+}
+
+
 bool
 Projections::read (const char* filename)
 {
@@ -311,6 +325,12 @@ Projections::read (const char* filename)
 }
 
 
+bool
+Projections::write (const string& filename)
+{
+  return write (filename.c_str());
+}
+
 bool
 Projections::write (const char* filename)
 {
@@ -442,14 +462,16 @@ Projections::detarrayWrite (fnetorderstream& fs, const DetectorArray& darray, co
 void
 Projections::printProjectionData (void)
 {
-  printf("Projections Print\n\n");
+  printf("Projections Data\n\n");
   printf("Description: %s\n", m_remark.c_str());
-  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("Geometry: %s\n", Scanner::convertGeometryIDToName (m_geometry));
+  printf("nView       = %8d           nDet = %8d\n", m_nView, m_nDet);
   printf("focalLength = %8.4f  fieldOfView = %8.4f\n", m_focalLength, m_fieldOfView);
+  printf("rotStart    = %8.4f       rotInc = %8.4f\n", m_rotStart, m_rotInc);
+  printf("detStart    = %8.4f       detInc = %8.4f\n", m_detStart, m_detInc);
   if (m_projData != NULL) {
       for (int ir = 0; ir < m_nView; ir++) {
+	  printf("View %d: angle %f\n", ir, m_projData[ir]->viewAngle());
 	  DetectorValue* detval = m_projData[ir]->detValues();
 	  for (int id = 0; id < m_projData[ir]->nDet(); id++)
 	      printf("%8.4f  ", detval[id]);
@@ -459,16 +481,19 @@ Projections::printProjectionData (void)
 }
 
 void 
-Projections::printScanInfo (void) const
+Projections::printScanInfo (ostringstream& os) const
 {
-  printf ("Number of detectors: %d\n", m_nDet);
-  printf ("    Number of views: %d\n", m_nView);
-  printf ("             Remark: %s\n", m_remark.c_str());
-  printf ("             phmLen: %f\n", m_phmLen);
-  printf ("           detStart: %f\n", m_detStart);
-  printf ("             detInc: %f\n", m_detInc);
-  printf ("           rotStart: %f\n", m_rotStart);
-  printf ("             rotInc: %f\n", m_rotInc);
+  os << "Number of detectors: " << m_nDet << "\n";
+  os << "    Number of views: " << m_nView<< "\n";
+  os << "             Remark: " << m_remark.c_str()<< "\n";
+  os << "           Geometry: " << Scanner::convertGeometryIDToName (m_geometry)<< "\n";
+  os << "       Focal Length: " << m_focalLength<< "\n";
+  os << "      Field Of View: " << m_fieldOfView<< "\n";
+  os << "             phmLen: " << m_phmLen<< "\n";
+  os << "           detStart: " << m_detStart<< "\n";
+  os << "             detInc: " << m_detInc<< "\n";
+  os << "           rotStart: " << m_rotStart<< "\n";
+  os << "             rotInc: " << m_rotInc<< "\n";
 }
 
 
@@ -512,7 +537,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, m_geometry);
+  ProcessSignal processSignal (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", filterGenerationName, zeropad, interpFactor, trace, m_geometry, m_focalLength);
 
   if (processSignal.fail()) {
       sys_error (ERR_SEVERE, "%s [Projections::reconstruct]", processSignal.failMessage().c_str());
@@ -558,12 +583,12 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
 
   for (int iview = 0; iview < m_nView; iview++)  {
     if (trace >= Trace::TRACE_CONSOLE) 
-      printf ("Reconstructing view %d (last = %d)\n",  iview, m_nView - 1);
+      cout <<"Reconstructing view " << iview << "(last = " << m_nView - 1 << ")\n";
       
     const DetectorArray& darray = getDetectorArray (iview);
     const DetectorValue* detval = darray.detValues();
 
-    processSignal.filterSignal (detval, filteredProj, iview);
+    processSignal.filterSignal (detval, filteredProj);
 
 #ifdef HAVE_BSPLINE_INTERP
     if (interp_type == I_BSPLINE)