X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Ffilter.h;h=5512bf890fb4596abfffcee223a795de58ef9048;hb=931ea35fdc3a7e463602644e6938730556bf92a7;hp=274d7920443ec1f7b5a8e7d67db607eab0ac1042;hpb=a95e41ac40cd2f3a4401d921618604cf33f2a904;p=ctsim.git

diff --git a/include/filter.h b/include/filter.h
index 274d792..5512bf8 100644
--- a/include/filter.h
+++ b/include/filter.h
@@ -1,29 +1,120 @@
+#ifndef FILTER_H
+#define FILTER_H
+
+
 class SignalFilter {
  public:
 
-    SignalFilter (const FilterType filt_type, double bw, double xmin, double xmax, int n, double param, const DomainType domain, const int numInt);
+    typedef enum { 	   
+	FILTER_INVALID,
+	FILTER_BANDLIMIT, 
+	FILTER_SINC,
+	FILTER_G_HAMMING,
+	FILTER_COSINE,
+	FILTER_TRIANGLE,
+	FILTER_ABS_BANDLIMIT, 	// filter times |x| 
+	FILTER_ABS_SINC, 
+	FILTER_ABS_G_HAMMING,
+	FILTER_ABS_COSINE,
+	FILTER_SHEPP
+    } FilterID;
+
+    typedef enum {
+	FILTER_METHOD_INVALID,
+	FILTER_METHOD_CONVOLUTION,
+	FILTER_METHOD_FOURIER,
+	FILTER_METHOD_FFT,
+	FILTER_METHOD_FFT_ZEROPAD_2,
+	FILTER_METHOD_FFT_ZEROPAD_4,
+	FILTER_METHOD_FFT_ZEROPAD_6
+    } FilterMethodID;
+
+    typedef enum {
+	DOMAIN_INVALID,
+	DOMAIN_FREQ,
+	DOMAIN_SPATIAL 
+    } DomainID;
+    
+    static const char FILTER_ABS_BANDLIMIT_STR[]= "abs_bandlimit";
+    static const char FILTER_ABS_SINC_STR[]=      "abs_sinc";
+    static const char FILTER_ABS_COS_STR[]=       "abs_cos";
+    static const char FILTER_ABS_HAMMING_STR[]=   "abs_hamming";
+    static const char FILTER_SHEPP_STR[]=         "shepp";
+    static const char FILTER_BANDLIMIT_STR[]=     "bandlimit";
+    static const char FILTER_SINC_STR[]=          "sinc";
+    static const char FILTER_COS_STR[]=           "cos";
+    static const char FILTER_HAMMING_STR[]=       "hamming";
+    static const char FILTER_TRIANGLE_STR[]=      "triangle";
+    
+    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 DOMAIN_FREQ_STR[]=    "freq";
+    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 FilterID filt_type, double bw, double xmin, double xmax, 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);
 
     ~SignalFilter (void);
 
     double* getFilter (void) const
       { return m_vecFilter; }
 
-    double convolve (const double f[], const double dx, const int n, const int np, const FunctionSymmetry func_type) const;
+    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;
+
+    bool fail(void) const 	{return m_fail;}
+    const string& failMessage(void) const {return m_failMessage;}
 
-    double convolve (const float f[], const double dx, const int n, const int np, const FunctionSymmetry func_type) const;
+    const string& nameFilter(void) const 	{ return m_nameFilter;}
+    const string& nameDomain(void) const 	{ return m_nameDomain;}
+    const FilterID idFilter(void) const 	{ return m_idFilter;}
+    const DomainID idDomain(void) const 	{ return m_idDomain;}
 
-    static double spatialResponseCalc (FilterType fType, double bw, double x, double param, int n);
+    double response (double x);
 
-    static double spatialResponseAnalytic (FilterType fType, double bw, double x, double param);
+    static double spatialResponse (FilterID fType, double bw, double x, double param, int nIntegral = 0);
 
-    static double frequencyResponse (FilterType fType, double bw, double u, 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);
 
  private:
-    double *m_vecFilter;
     double m_bw;
-    FilterType m_filterType;
-
-    double spatialResponseCalc (double x, double param, int n) const;
+    int m_nPoints;
+    double m_xmin;
+    double m_xmax;
+    double* m_vecFilter;
+    bool m_fail;
+    string m_failMessage;
+    string m_nameFilter;
+    string m_nameFilterMethod;
+    string m_nameDomain;
+    FilterID m_idFilter;
+    FilterMethodID m_idFilterMethod;
+    DomainID m_idDomain;
+    double m_filterParam;
+    int m_numIntegral;
+
+    static FilterID convertFilterNameToID (const char* filterName);
+    static const char* convertFilterIDToName (const FilterID filterID);
+    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);
+
+double spatialResponseCalc (double x, double param, int n) const;
 
     double spatialResponseAnalytic (double x, double param) const;
 
@@ -36,3 +127,5 @@ class SignalFilter {
 
 };
 
+
+#endif