X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Ffilter.h;fp=include%2Ffilter.h;h=4a25b5bcd6eee6a91eca50a4407dcf33af30cb1b;hp=9ee7390a4acd83c96bd9a72b7f9990fbfe7bede9;hb=30e455abcd8cac05ce7afe43216ec9e26342e1cf;hpb=29ceda2bc7505f0496e1cb5d1e45b489cafa7891

diff --git a/include/filter.h b/include/filter.h
index 9ee7390..4a25b5b 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.12 2000/07/07 15:30:59 kevin Exp $
+**  $Id: filter.h,v 1.13 2000/07/11 10:32:44 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
@@ -88,11 +88,11 @@ class SignalFilter {
     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 zeropad = 0, 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 preinterpolationFactor = 1);
 
-    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 FilterID filt_type, FilterMethodID filterMethodID, double bw, double signalIncrement, int n, double param, const DomainID domain, const int zeropad = 0, const int preinterpolationFactor = 1);
 
-    SignalFilter (const char* filterName, const char* domainName, double bw, double param, int numIntegral = 0);
+    SignalFilter (const char* filterName, const char* domainName, double bw, double param);
 
     ~SignalFilter (void);
 
@@ -132,14 +132,16 @@ class SignalFilter {
 
     double response (double x);
 
-    static double spatialResponse (FilterID fType, double bw, double x, double param, int nIntegral = 0);
+    static double spatialResponse (FilterID fType, double bw, double x, double param);
 
     static double frequencyResponse (FilterID fType, double bw, double u, double param);
 
-    static double spatialResponseCalc (FilterID fType, double bw, double x, double param, int n);
-
     static double spatialResponseAnalytic (FilterID fType, double bw, double x, double param);
 
+    static double spatialResponseCalc (FilterID fType, double bw, double x, double param, int nIntegral);
+
+    static void setNumIntegral(int nIntegral) {N_INTEGRAL = nIntegral;}
+
  private:
     double m_bw;
     int m_nFilterPoints;
@@ -153,9 +155,9 @@ class SignalFilter {
     double* m_vecFourierSinTable;
     complex<double>* m_complexVecFilter;
 #ifdef HAVE_FFTW
-    fftw_real* m_vecRealFftInput;
+    fftw_real* m_vecRealFftInput, *m_vecRealFftSignal;
     rfftw_plan m_realPlanForward, m_realPlanBackward;
-    fftw_complex* m_vecComplexFftInput;
+    fftw_complex* m_vecComplexFftInput, *m_vecComplexFftSignal;
     fftw_plan m_complexPlanForward, m_complexPlanBackward;
 #endif
 
@@ -168,10 +170,14 @@ class SignalFilter {
     FilterMethodID m_idFilterMethod;
     DomainID m_idDomain;
     double m_filterParam;
-    int m_numIntegral;
     int m_traceLevel;
     int m_zeropad;
+    int m_nOutputPoints;
+    int m_preinterpolationFactor;
 
+    static int N_INTEGRAL;
+
+    static const bool haveAnalyticSpatial (const FilterID filterID);
     static const FilterID convertFilterNameToID (const char* filterName);
     static const char* convertFilterIDToName (const FilterID filterID);
     static const FilterMethodID convertFilterMethodNameToID (const char* filterMethodName);
@@ -179,9 +185,9 @@ 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 zeropad, 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 preInterpScale);
 
-double spatialResponseCalc (double x, double param, int n) const;
+    double spatialResponseCalc (double x, double param) const;
 
     double spatialResponseAnalytic (double x, double param) const;
 
@@ -194,5 +200,4 @@ double spatialResponseCalc (double x, double param, int n) const;
 
 };
 
-
 #endif