X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Ffilter.h;h=7040a3bcabd2742ca0e94f0cfea2ed18cb6800dd;hb=a2a9671aff06827cec6d6b80234b90128d337e40;hp=5f5789b6fa2e857d1271ff042f4f8414b6adbb44;hpb=e4ffe82feebf1df2ac1dd14633818eb9a739863f;p=ctsim.git

diff --git a/include/filter.h b/include/filter.h
index 5f5789b..7040a3b 100644
--- 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.10 2000/07/06 08:30:30 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
@@ -50,9 +50,7 @@ class SignalFilter {
 	FILTER_METHOD_CONVOLUTION,
 	FILTER_METHOD_FOURIER,
 	FILTER_METHOD_FFT,
-	FILTER_METHOD_FFT_ZEROPAD_2,
-	FILTER_METHOD_FFT_ZEROPAD_4,
-	FILTER_METHOD_FFT_ZEROPAD_6
+	FILTER_METHOD_FFTW,
     } FilterMethodID;
 
     typedef enum {
@@ -75,17 +73,15 @@ class SignalFilter {
     static const char FILTER_METHOD_CONVOLUTION_STR[]=  "convolution";
     static const char FILTER_METHOD_FOURIER_STR[]=      "fourier";
     static const char FILTER_METHOD_FFT_STR[]=          "fft";
-    static const char FILTER_METHOD_FFT_ZEROPAD_2_STR[]="fft_zeropad2";
-    static const char FILTER_METHOD_FFT_ZEROPAD_4_STR[]="fft_zeropad4";
-    static const char FILTER_METHOD_FFT_ZEROPAD_6_STR[]="fft_zeropad6";
+    static const char FILTER_METHOD_FFTW_STR[]=         "fftw";
 
-    static const char DOMAIN_FREQUENCY_STR[]=    "frequency";
-    static const char DOMAIN_SPATIAL_STR[]= "spatial";
+    static const char DOMAIN_FREQUENCY_STR[]="frequency";
+    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 zeropad = 0, 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 zeropad = 0, const int numIntegral = 0);
 
     SignalFilter (const char* filterName, const char* domainName, double bw, double param, int numIntegral = 0);
 
@@ -101,13 +97,19 @@ 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 complex<double> 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 complex<double> input[], complex<double> output[], const int direction) const;
+
+    void setTraceLevel (int traceLevel) {m_traceLevel = traceLevel; }
+
     bool fail(void) const 	{return m_fail;}
     const string& failMessage(void) const {return m_failMessage;}
 
@@ -115,6 +117,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);
 
@@ -126,16 +131,26 @@ class SignalFilter {
 
     static double spatialResponseAnalytic (FilterID fType, double bw, double x, double param);
 
+    static void dotProduct (const double v1[], const complex<double> v2[], complex<double> output[], const int n);
+
  private:
     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;
+    complex<double>* m_complexVecFilter;
+#ifdef HAVE_FFTW
+    fftw_plan m_planForward, m_planBackward;
+    fftw_complex* m_vecFftInput;
+#else
+    complex<double>* m_vecFftInput;
+#endif
 
     bool m_fail;
     string m_failMessage;
@@ -147,6 +162,8 @@ class SignalFilter {
     DomainID m_idDomain;
     double m_filterParam;
     int m_numIntegral;
+    int m_traceLevel;
+    int m_zeropad;
 
     static const FilterID convertFilterNameToID (const char* filterName);
     static const char* convertFilterIDToName (const FilterID filterID);
@@ -155,7 +172,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 zeropad, const int numInt);
 
 double spatialResponseCalc (double x, double param, int n) const;