r128: *** empty log message ***

diff --git a/include/filter.h b/include/filter.h
index 5f5789b6fa2e857d1271ff042f4f8414b6adbb44..7a50a7dc1682042129e475d43cd3dee6dd6cc39b 100644 (file)
--- a/include/filter.h
+++ b/include/filter.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: filter.h,v 1.6 2000/07/02 18:21:39 kevin Exp $
+**  $Id: filter.h,v 1.7 2000/07/03 11:02:06 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
@@ -83,9 +83,9 @@ class SignalFilter {
     static const char DOMAIN_SPATIAL_STR[]= "spatial";
 
 
-    SignalFilter (const char* filterName, const char* filterMethodName,double bw, double signalLength, int n, double param, const char* domainName, const int numIntegral = 0);
+    SignalFilter (const char* filterName, const char* filterMethodName,double bw, double signalIncrement, int n, double param, const char* domainName, const int numIntegral = 0);
 
-    SignalFilter (const FilterID filt_type, FilterMethodID filterMethodID, double bw, double signalLength, int n, double param, const DomainID domain, const int numIntegral = 0);
+    SignalFilter (const FilterID filt_type, FilterMethodID filterMethodID, double bw, double signalIncrement, int n, double param, const DomainID domain, const int numIntegral = 0);
 
     SignalFilter (const char* filterName, const char* domainName, double bw, double param, int numIntegral = 0);
 
@@ -101,12 +101,12 @@ class SignalFilter {
 
     double convolve (const float f[], const double dx, const int n, const int np) const;
 
-    void filterSignal (const double input[], double output[], double dx, const int n) const;
-    void filterSignal (const float input[], double output[], double dx, const int n) const;
+    void filterSignal (const double input[], double output[]) const;
+    void filterSignal (const float input[], double output[]) const;
 
-    static void finiteFourierTransform (const double input[], complex<double> output[], const int n, const int direction);
+    static void finiteFourierTransform (const float input[], complex<double> output[], const int n, const int direction);
 
-    void finiteFourierTransform (const double input[], complex<double> output[], const int direction) const;
+    void finiteFourierTransform (const float input[], complex<double> output[], const int direction) const;
 
     bool fail(void) const      {return m_fail;}
     const string& failMessage(void) const {return m_failMessage;}
@@ -115,6 +115,9 @@ class SignalFilter {
     const string& nameDomain(void) const       { return m_nameDomain;}
     const FilterID idFilter(void) const        { return m_idFilter;}
     const DomainID idDomain(void) const        { return m_idDomain;}
+    const double getFilterMin(void) const {return m_filterMin;}
+    const double getFilterMax(void) const {return m_filterMax;}
+    const double getFilterIncrement(void) const {return m_filterInc;}
 
     double response (double x);
 
@@ -130,9 +133,10 @@ class SignalFilter {
     double m_bw;
     int m_nFilterPoints;
     int m_nSignalPoints;
-    double m_signalLength;
-    double m_xmin;
-    double m_xmax;
+    double m_signalInc;
+    double m_filterMin;
+    double m_filterMax;
+    double m_filterInc;
     double* m_vecFilter;
     double* m_vecFourierCosTable;
     double* m_vecFourierSinTable;
@@ -155,7 +159,7 @@ class SignalFilter {
     static const DomainID convertDomainNameToID (const char* domainName);
     static const char* convertDomainIDToName (const DomainID domainID);
 
-    void init (const FilterID filt_type, const FilterMethodID filterMethod, double bw, double xmin, double xmax, int n, double param, const DomainID domain, const int numInt);
+    void init (const FilterID filt_type, const FilterMethodID filterMethod, double bw, double signalIncrement, int n, double param, const DomainID domain, const int numInt);
 
 double spatialResponseCalc (double x, double param, int n) const;
 

diff --git a/libctsim/filter.cpp b/libctsim/filter.cpp
index bfb55e8dc4695ee5fb451c2847c3185d5e63990a..3215d6a2e27c1037ebc3a01ed385a220ccb8aa60 100644 (file)
--- a/libctsim/filter.cpp
+++ b/libctsim/filter.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: filter.cpp,v 1.6 2000/07/02 18:21:39 kevin Exp $
+**  $Id: filter.cpp,v 1.7 2000/07/03 11:02:06 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
@@ -32,11 +32,11 @@
  *   SignalFilter::SignalFilter     Construct a signal
  *
  * SYNOPSIS
- *   f = SignalFilter (filt_type, bw, xmin, xmax, n, param, domain, analytic)
+ *   f = SignalFilter (filt_type, bw, filterMin, filterMax, n, param, domain, analytic)
  *   double f          Generated filter vector
  *   int filt_type     Type of filter wanted
  *   double bw         Bandwidth of filter
- *   double xmin, xmax Filter limits
+ *   double filterMin, filterMax       Filter limits
  *   int n             Number of points in signal
  *   double param      General input parameter to filters
  *   int domain                FREQUENCY or SPATIAL domain wanted
@@ -44,7 +44,7 @@
  *                     for spatial domain filters.  For ANALYTIC solutions, use numint = 0
  */
 
-SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName, double bw, double signalLength, int n, double param, const char* domainName, int numIntegral = 0)
+SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName, double bw, double signalIncrement, int n, double param, const char* domainName, int numIntegral = 0)
 {
   m_vecFilter = NULL;
   m_vecFourierCosTable = NULL;
@@ -70,18 +70,19 @@ SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName
     m_failMessage += domainName;
     return;
   }
-  init (m_idFilter, m_idFilterMethod, bw, signalLength, n, param, m_idDomain, numIntegral);
+  init (m_idFilter, m_idFilterMethod, bw, signalIncrement, n, param, m_idDomain, numIntegral);
 }
 
-SignalFilter::SignalFilter (const FilterID filterID, const FilterMethodID filterMethodID, double bw, double signalLength, int n, double param, const DomainID domainID, int numIntegral = 0)
+SignalFilter::SignalFilter (const FilterID filterID, const FilterMethodID filterMethodID, double bw, double signalIncrement, int n, double param, const DomainID domainID, int numIntegral = 0)
 {
-  init (filterID, filterMethodID, bw, signalLength, n, param, domainID, numIntegral);
+  init (filterID, filterMethodID, bw, signalIncrement, n, param, domainID, numIntegral);
 }
 
 SignalFilter::SignalFilter (const char* filterName, const char* domainName, double bw, double param, int numIntegral = 0)
 {
   m_bw = bw;
-  m_nPoints = 0;
+  m_nSignalPoints = 0;
+  m_nFilterPoints = 0;
   m_vecFilter = NULL;
   m_vecFourierCosTable = NULL;
   m_vecFourierSinTable = NULL;
@@ -104,7 +105,7 @@ SignalFilter::SignalFilter (const char* filterName, const char* domainName, doub
 }
 
 void
-SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID, double bw, double signalLength, int n, double param, const DomainID domainID, int numint)
+SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID, double bw, double signalIncrement, int n, double param, const DomainID domainID, int numint)
 {
   m_bw = bw;
   m_idFilter = filterID;
@@ -121,12 +122,13 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID
   m_nSignalPoints = n;
   m_nFilterPoints = 2 * m_nSignalPoints - 1;
 
-  m_signalLength = signalLength;
-  m_xmin = -signalLength;
-  m_xmax = signalLength;
+  m_signalInc = signalIncrement;
+  m_filterMin = -signalIncrement * (m_nSignalPoints - 1);
+  m_filterMax = signalIncrement * (m_nSignalPoints - 1);
+  m_filterInc = (m_filterMax - m_filterMin) / (m_nFilterPoints - 1);
   m_numIntegral = numint;
   m_filterParam = param;  
-  m_vecFilter = new double[n];
+  m_vecFilter = new double[ m_nFilterPoints ];
   if (m_idFilterMethod == FILTER_METHOD_FOURIER) {
     int nFourier = n * n + 1;
     double angleIncrement = (2. * PI) / n;
@@ -138,12 +140,10 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID
     }
   }
 
-  double xinc = (m_xmax - m_xmin) / (m_nPoints - 1);
-
   if (m_idFilter == FILTER_SHEPP) {
     double a = 2 * m_bw;
     double c = - 4. / (a * a);
-    int center = (m_nPoints - 1) / 2;
+    int center = (m_nFilterPoints - 1) / 2;
     int sidelen = center;
     m_vecFilter[center] = 4. / (a * a);
 
@@ -152,12 +152,12 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID
   } else if (m_idDomain == DOMAIN_FREQUENCY) {
     double x;
     int i;
-    for (x = m_xmin, i = 0; i < m_nPoints; x += xinc, i++)
+    for (x = m_filterMin, i = 0; i < m_nFilterPoints; x += m_filterInc, i++)
       m_vecFilter[i] = frequencyResponse (x, param);
   } else if (m_idDomain == DOMAIN_SPATIAL) {
     double x;
     int i;
-    for (x = m_xmin, i = 0; i < m_nPoints; x += xinc, i++)
+    for (x = m_filterMin, i = 0; i < m_nFilterPoints; x += m_filterInc, i++)
       if (numint == 0)
        m_vecFilter[i] = spatialResponseAnalytic (x, param);
       else
@@ -305,31 +305,21 @@ SignalFilter::convertDomainIDToName (const DomainID domain)
 
 
 void
-SignalFilter::filterSignal (const double input[], double output[], double dx, const int n) const
+SignalFilter::filterSignal (const float input[], double output[]) const
 {
   if (m_idFilterMethod == FILTER_METHOD_CONVOLUTION) {
-    for (int i = 0; i < n; i++)
-      output[i] = convolve (input, dx, i, n);
+    for (int i = 0; i < m_nSignalPoints; i++)
+      output[i] = convolve (input, m_signalInc, i, m_nSignalPoints);
   } else if (m_idFilterMethod == FILTER_METHOD_FOURIER) {
-    complex<double> fftSignal[n];
+    complex<double> fftSignal[m_nSignalPoints];
     complex<double> complexOutput;
     finiteFourierTransform (input, fftSignal, 1);
-    finiteFourierTransform (fftSignal, complexOutput, -1);
-    for (int i = 0; i < n; i++)
-      output[i] = complexOutput[i].mag();
-  }
-}
-
-void
-SignalFilter::filterSignal (const float input[], double output[], double dx, const int n) const
-{
-  if (m_idFilterMethod == FILTER_METHOD_CONVOLUTION) {
-    for (int i = 0; i < n; i++)
-      output[i] = convolve (input, dx, i, n);
+    //    finiteFourierTransform (fftSignal, complexOutput, -1);
+    //    for (int i = 0; i < m_nSignalPoints; i++)
+    //      output[i] = complexOutput[i].hypot();
   }
 }
 
-
 double
 SignalFilter::response (double x)
 {
@@ -657,7 +647,7 @@ for (int i = 0; i < np; i++)
 
 
 void
-SignalFilter::finiteFourierTransform (const double input[], complex<double> output[], const int n, int direction)
+SignalFilter::finiteFourierTransform (const float input[], complex<double> output[], const int n, int direction)
 {
   if (direction < 0)
     direction = -1;
@@ -682,17 +672,17 @@ SignalFilter::finiteFourierTransform (const double input[], complex<double> outp
 }
 
 void
-SignalFilter::finiteFourierTransform (const double input[], complex<double> output[], int direction) const
+SignalFilter::finiteFourierTransform (const float input[], complex<double> output[], int direction) const
 {
   if (direction < 0)
     direction = -1;
   else 
     direction = 1;
     
-  double angleIncrement = 2 * PI / m_nPoints;
-  for (int i = 0; i < m_nPoints; i++) {
+  double angleIncrement = 2 * PI / m_nSignalPoints;
+  for (int i = 0; i < m_nSignalPoints; i++) {
     double sumReal = 0, sumImag = 0;
-    for (int j = 0; j < m_nPoints; j++) {
+    for (int j = 0; j < m_nSignalPoints; j++) {
       int tableIndex = i * j;
       if (direction > 0) {
        sumReal += input[i] * m_vecFourierCosTable[tableIndex];
@@ -703,8 +693,8 @@ SignalFilter::finiteFourierTransform (const double input[], complex<double> outp
       }
     }
     if (direction > 0) {
-      sumReal /= m_nPoints;
-      sumImag /= m_nPoints;
+      sumReal /= m_nSignalPoints;
+      sumImag /= m_nSignalPoints;
     }
     output[i] = complex<double> (sumReal, sumImag);
   }

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index 6e21b3568285ded1049dccf2d2ca9f7052e26a8f..b54186447141fafa9f21b672dd120820c32bb20d 100644 (file)
--- 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.8 2000/07/02 18:21:39 kevin Exp $
+**  $Id: projections.cpp,v 1.9 2000/07/03 11:02:06 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
@@ -491,7 +491,6 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
 {
   int nview = m_nView;
   double detInc = m_detInc;
-  double detlen = (m_nDet - 1) * detInc;
   int n_filteredProj = m_nDet;
   double filteredProj [n_filteredProj];   // filtered projections
 
@@ -506,8 +505,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
 #endif
 
   double filterBW = 1. / detInc;
-
-  SignalFilter filter (filterName, filterMethodName, filterBW, detlen, m_nDet, filt_param, "spatial", 0);
+  SignalFilter filter (filterName, filterMethodName, filterBW, m_detInc, m_nDet, filt_param, "spatial", 0);
   if (filter.fail()) {
       sys_error (ERR_SEVERE, "%s [Projections::reconstruct]", filter.failMessage().c_str());
       return false;
@@ -524,8 +522,8 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
   if (trace > TRACE_TEXT)  {
     int i;
     double f;
-    double filterInc = (detlen * 2) / (n_vec_filter - 1);
-    for (i = 0, f = -detlen; i < n_vec_filter; i++, f += filterInc)
+    double filterInc = filter.getFilterIncrement();
+    for (i = 0, f = filter.getFilterMin(); i < n_vec_filter; i++, f += filterInc)
       plot_xaxis[i] = f;
       
     gid = ezplot (plot_xaxis, filter.getFilter(), n_vec_filter);
@@ -551,7 +549,7 @@ Projections::reconstruct (ImageFile& im, const char* const filterName, double fi
     DetectorArray& darray = getDetectorArray (iview);
     DetectorValue* detval = darray.detValues();
 
-    filter.filterSignal (detval, filteredProj, detInc, m_nDet);
+    filter.filterSignal (detval, filteredProj);
 
     //    for (int j = 0; j < m_nDet; j++)
     //      filteredProj[j] = filter.convolve (detval, detInc, j, m_nDet);