X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Ffilter.h;h=7a50a7dc1682042129e475d43cd3dee6dd6cc39b;hb=53c732778ed19ac5231bb17c7e5bd4d2201d9456;hp=19266a0edbce9e909d39bb127436f7de8a86fa68;hpb=00bead9fe7ab835c1584eac4ab586cc56742eaf3;p=ctsim.git

diff --git a/include/filter.h b/include/filter.h
index 19266a0..7a50a7d 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.5 2000/06/30 02:03:27 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, double bw, double xmin, double xmax, 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, double bw, double xmin, double xmax, 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);
 
@@ -94,10 +94,20 @@ class SignalFilter {
     double* getFilter (void) const
       { return m_vecFilter; }
 
+    int getNFilterPoints (void) const
+	{ return m_nFilterPoints; }
+
     double convolve (const double f[], const double dx, const int n, const int np) const;
 
     double convolve (const float f[], const double dx, const int n, const int np) const;
 
+    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);
+
+    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;}
 
@@ -105,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);
 
@@ -118,10 +131,16 @@ class SignalFilter {
 
  private:
     double m_bw;
-    int m_nPoints;
-    double m_xmin;
-    double m_xmax;
+    int m_nFilterPoints;
+    int m_nSignalPoints;
+    double m_signalInc;
+    double m_filterMin;
+    double m_filterMax;
+    double m_filterInc;
     double* m_vecFilter;
+    double* m_vecFourierCosTable;
+    double* m_vecFourierSinTable;
+
     bool m_fail;
     string m_failMessage;
     string m_nameFilter;
@@ -133,12 +152,14 @@ class SignalFilter {
     double m_filterParam;
     int m_numIntegral;
 
-    static FilterID convertFilterNameToID (const char* filterName);
+    static const FilterID convertFilterNameToID (const char* filterName);
     static const char* convertFilterIDToName (const FilterID filterID);
+    static const FilterMethodID convertFilterMethodNameToID (const char* filterMethodName);
+    static const char* convertFilterMethodIDToName (const FilterMethodID filterMethodID);
     static const DomainID convertDomainNameToID (const char* domainName);
     static const char* convertDomainIDToName (const DomainID domainID);
 
-    void init (const FilterID filt_type, 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;