X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fprocsignal.cpp;h=c40e2972ad606290afef9a33ec7dd0f9a8f96355;hp=71a0e67bad2121c37eb063ca893f0e70f4e7919e;hb=1f05afcd917bbf8b56a9446e4f937864f09b33f4;hpb=5ff5b33a6bc64fb804106c4d50b83e4cf0d7b0f4

diff --git a/libctsim/procsignal.cpp b/libctsim/procsignal.cpp
index 71a0e67..c40e297 100644
--- a/libctsim/procsignal.cpp
+++ b/libctsim/procsignal.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: procsignal.cpp,v 1.14 2001/01/02 16:02:13 kevin Exp $
+**  $Id: procsignal.cpp,v 1.15 2001/01/12 03:49:07 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
@@ -77,7 +77,10 @@ const int ProcessSignal::s_iFilterGenerationCount = sizeof(s_aszFilterGeneration
 // CLASS IDENTIFICATION
 //   ProcessSignal
 //
-ProcessSignal::ProcessSignal (const char* szFilterName, const char* szFilterMethodName, double dBandwidth, double dSignalIncrement, int nSignalPoints, double dFilterParam, const char* szDomainName, const char* szFilterGenerationName, int iZeropad, int iPreinterpolationFactor, int iTraceLevel, int iGeometry, double dFocalLength, SGP* pSGP)
+ProcessSignal::ProcessSignal (const char* szFilterName, const char* szFilterMethodName, double dBandwidth, 
+							  double dSignalIncrement, int nSignalPoints, double dFilterParam, const char* szDomainName, 
+							  const char* szFilterGenerationName, int iZeropad, int iPreinterpolationFactor, int iTraceLevel, 
+							  int iGeometry, double dFocalLength, SGP* pSGP)
 : m_adFourierCosTable(NULL), m_adFourierSinTable(NULL), m_adFilter(NULL), m_fail(false)
 {
   m_idFilterMethod = convertFilterMethodNameToID (szFilterMethodName);
@@ -109,12 +112,16 @@ ProcessSignal::ProcessSignal (const char* szFilterName, const char* szFilterMeth
     return;
   }
   
-  init (m_idFilter, m_idFilterMethod, dBandwidth, dSignalIncrement, nSignalPoints, dFilterParam, m_idDomain, m_idFilterGeneration, iZeropad, iPreinterpolationFactor, iTraceLevel, iGeometry, dFocalLength, pSGP);
+  init (m_idFilter, m_idFilterMethod, dBandwidth, dSignalIncrement, nSignalPoints, dFilterParam, m_idDomain, 
+	  m_idFilterGeneration, iZeropad, iPreinterpolationFactor, iTraceLevel, iGeometry, dFocalLength, pSGP);
 }
 
 
 void
-ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandwidth, double dSignalIncrement, int nSignalPoints, double dFilterParam, const int idDomain, const int idFilterGeneration, const int iZeropad, const int iPreinterpolationFactor, int iTraceLevel, int iGeometry, double dFocalLength, SGP* pSGP)
+ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandwidth, double dSignalIncrement, 
+					 int nSignalPoints, double dFilterParam, const int idDomain, const int idFilterGeneration, 
+					 const int iZeropad, const int iPreinterpolationFactor, int iTraceLevel, int iGeometry, 
+					 double dFocalLength, SGP* pSGP)
 {
   int i;
   m_idFilter = idFilter;
@@ -139,7 +146,8 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
   m_iPreinterpolationFactor = iPreinterpolationFactor;
   
   // scale signalInc/BW to signalInc/2 to adjust for imaginary detector
-  // through origin of phantom, see Kak-Slaney Fig 3.22, for Collinear
+  // through origin of phantom rather than 2 times distance to detector, 
+  // see Kak-Slaney Fig 3.22, for Collinear diagram
   if (m_idGeometry == Scanner::GEOMETRY_EQUILINEAR) {
     m_dSignalInc /= 2;
     m_dBandwidth *= 2;
@@ -278,6 +286,9 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
       
       // This doesn't work!
       // Need to add filtering for divergent geometries & Frequency/Direct filtering
+	  // Jan 2001: Direct seems to work for equilinear and equiangular
+	  // however, inverse_fourier doesn't work for equiangular on all versions of CTSim tested
+
       if (m_idGeometry == Scanner::GEOMETRY_EQUILINEAR) {
         for (i = 0; i < m_nFilterPoints; i++)
           m_adFilter[i] *= 0.5;
@@ -350,6 +361,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
         delete pEZPlot;
       }
 #endif
+
       if (m_idGeometry == Scanner::GEOMETRY_EQUILINEAR) {
         for (i = 0; i < m_nFilterPoints; i++)
           adSpatialFilter[i] *= 0.5;
@@ -375,6 +387,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
       for (i = 0; i < m_nFilterPoints; i++)
         m_adFilter[i] = std::abs (acInverseFilter[i]) * m_dSignalInc;
       delete acInverseFilter;
+
 #ifdef HAVE_SGP
       if (pEZPlot && m_traceLevel >= Trace::TRACE_PLOT) {
         pEZPlot->ezset ("title Spatial Filter: Inverse");