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

diff --git a/include/filter.h b/include/filter.h
index 8e0740b..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.9 2000/07/04 22:21:01 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 signalIncrement, 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 signalIncrement, 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);
 
@@ -104,11 +100,11 @@ class SignalFilter {
     void filterSignal (const double input[], double output[]) const;
     void filterSignal (const float input[], double output[]) const;
 
-    static void finiteFourierTransform (const float input[], complex<double> output[], const int n, const int direction);
+    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 float input[], complex<double> output[], const int direction) const;
+    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;
 
@@ -151,6 +147,9 @@ class SignalFilter {
     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;
@@ -164,6 +163,7 @@ class SignalFilter {
     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);
@@ -172,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 signalIncrement, 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;