X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=include%2Ffilter.h;h=9bbf554873cb6cad0d37eb3994075dcba5c2e4e4;hb=08f34bf3ba14d4f436f4d2ef0ee5af1d6eb266ac;hp=b544a1f2132ac16671cbab6bde3e6c320cebcbbf;hpb=6e9304595677d093974038ffad44f8d54178e741;p=ctsim.git

diff --git a/include/filter.h b/include/filter.h
index b544a1f..9bbf554 100644
--- a/include/filter.h
+++ b/include/filter.h
@@ -25,10 +25,26 @@ class SignalFilter {
 	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 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 numInt);
+    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 numInt);
+    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);
 
@@ -40,19 +56,23 @@ class SignalFilter {
     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;}
+
     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 response (const char* const FilterName, const char* const DomainName, double bw, double x, double param);
+    double response (double x);
+
+    static double spatialResponse (FilterID fType, double bw, double x, double param, int nIntegral = 0);
+
+    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 frequencyResponse (FilterID fType, double bw, double u, double param);
-
  private:
     double m_bw;
     int m_nPoints;
@@ -60,24 +80,13 @@ class SignalFilter {
     double m_xmax;
     double* m_vecFilter;
     bool m_fail;
+    string m_failMessage;
     string m_nameFilter;
     string m_nameDomain;
     FilterID m_idFilter;
     DomainID m_idDomain;
-
-    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 DOMAIN_FREQ_STR[]=    "freq";
-    static const char DOMAIN_SPATIAL_STR[]= "spatial";
+    double m_filterParam;
+    int m_numIntegral;
 
     static FilterID convertFilterNameToID (const char* filterName);
     static const char* convertFilterIDToName (const FilterID filterID);