X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Ffilter.h;h=6b7d34e99c5ec56516a78af055110ac0dbc1f1e9;hp=d8444a6a972b12f750857bd48716cd373c4fe942;hb=f13a8c004b8f182b42d9e4df2bcd7c7f030bf1ad;hpb=9776c9a12ba53419d34563a5ec57c90e3d6798f4

diff --git a/include/filter.h b/include/filter.h
index d8444a6..6b7d34e 100644
--- a/include/filter.h
+++ b/include/filter.h
@@ -1,15 +1,13 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**	Name:	      filter.h
+**      Name:         filter.h
 **      Purpose:      Signal filter header file
-**	Programmer:   Kevin Rosenberg
-**	Date Started: June 2000
+**      Programmer:   Kevin Rosenberg
+**      Date Started: June 2000
 **
 **  This is part of the CTSim program
-**  Copyright (c) 1983-2001 Kevin Rosenberg
-**
-**  $Id: filter.h,v 1.27 2001/02/22 18:22:40 kevin Exp $
+**  Copyright (c) 1983-2009 Kevin Rosenberg
 **
 **  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
@@ -33,8 +31,7 @@
 #include "config.h"
 #endif
 #ifdef HAVE_FFTW
-#include <fftw.h>
-#include <rfftw.h>
+#include <fftw3.h>
 #endif
 
 
@@ -50,7 +47,7 @@
 class SignalFilter {
  public:
     static const int FILTER_INVALID;
-    static const int FILTER_ABS_BANDLIMIT; 	// filter times |x|
+    static const int FILTER_ABS_BANDLIMIT;      // filter times |x|
     static const int FILTER_ABS_SINC;
     static const int FILTER_ABS_G_HAMMING;
     static const int FILTER_ABS_HANNING;
@@ -66,7 +63,7 @@ class SignalFilter {
     static const int DOMAIN_INVALID;
     static const int DOMAIN_FREQUENCY;
     static const int DOMAIN_SPATIAL;
-    
+
     SignalFilter (const char* szFilterName, double dFilterMinimum, double dFilterMaximum, int nFilterPoints, double dBandwidth, double dFilterParam, const char* szDomainName);
 
     SignalFilter (const int idFilter, double dFilterMinimum, double dFilterMaximum, int nFilterPoints, double dBandwidth, double dFilterParam, const int idDomain);
@@ -78,13 +75,13 @@ class SignalFilter {
     double* getFilter (void) const
       { return m_adFilter; }
 
-    bool fail(void) const 	{return m_fail;}
+    bool fail(void) const       {return m_fail;}
     const std::string& failMessage(void) const {return m_failMessage;}
 
-    const std::string& nameFilter(void) const 	{ return m_nameFilter;}
-    const std::string& nameDomain(void) const 	{ return m_nameDomain;}
-    const int idFilter(void) const 	{ return m_idFilter;}
-    const int idDomain(void) const 	{ return m_idDomain;}
+    const std::string& nameFilter(void) const   { return m_nameFilter;}
+    const std::string& nameDomain(void) const   { return m_nameDomain;}
+    const int idFilter(void) const      { return m_idFilter;}
+    const int idDomain(void) const      { return m_idDomain;}
 
     int getNFilterPoints (void) const  { return m_nFilterPoints; }
     const double getFilterMin(void) const {return m_dFilterMin;}