X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Ffilter.cpp;h=d97ca2567f989d3018e42607241dc8c70e903854;hp=e8038aad7203790f5beb15462dcf96272401abd0;hb=00bead9fe7ab835c1584eac4ab586cc56742eaf3;hpb=153fc8adf687148dca8aac8e04dd47e9f90887e6

diff --git a/libctsim/filter.cpp b/libctsim/filter.cpp
index e8038aa..d97ca25 100644
--- a/libctsim/filter.cpp
+++ b/libctsim/filter.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: filter.cpp,v 1.4 2000/06/25 17:32:24 kevin Exp $
+**  $Id: filter.cpp,v 1.5 2000/06/30 02:03:27 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
@@ -39,7 +39,7 @@
  *   double xmin, xmax	Filter limits
  *   int n		Number of points in filter
  *   double param	General input parameter to filters
- *   int domain		FREQ or SPATIAL domain wanted
+ *   int domain		FREQUENCY or SPATIAL domain wanted
  *   int numint		Number if intervals for calculating discrete inverse fourier xform
  *			for spatial domain filters.  For ANALYTIC solutions, use numint = 0
  */
@@ -123,7 +123,7 @@ SignalFilter::init (const FilterID filterID, double bw, double xmin, double xmax
 
     for (int i = 1; i <= sidelen; i++ )
       m_vecFilter [center + i] = m_vecFilter [center - i] = c / (4 * (i * i) - 1);
-  } else if (m_idDomain == DOMAIN_FREQ) {
+  } else if (m_idDomain == DOMAIN_FREQUENCY) {
     double x;
     int i;
     for (x = m_xmin, i = 0; i < m_nPoints; x += xinc, i++)
@@ -214,8 +214,8 @@ SignalFilter::convertDomainNameToID (const char* const domainName)
 
   if (strcasecmp (domainName, DOMAIN_SPATIAL_STR) == 0)
     dID = DOMAIN_SPATIAL;
-  else if (strcasecmp (domainName, DOMAIN_FREQ_STR) == 0)
-    dID = DOMAIN_FREQ;
+  else if (strcasecmp (domainName, DOMAIN_FREQUENCY_STR) == 0)
+    dID = DOMAIN_FREQUENCY;
 
   return (dID);
 }
@@ -227,8 +227,8 @@ SignalFilter::convertDomainIDToName (const DomainID domain)
 
   if (domain == DOMAIN_SPATIAL)
     return (DOMAIN_SPATIAL_STR);
-  else if (domain == DOMAIN_FREQ)
-    return (DOMAIN_FREQ_STR);
+  else if (domain == DOMAIN_FREQUENCY)
+    return (DOMAIN_FREQUENCY_STR);
 
   return (name);
 }
@@ -241,7 +241,7 @@ SignalFilter::response (double x)
 
   if (m_idDomain == DOMAIN_SPATIAL)
     response = spatialResponse (m_idFilter, m_bw, x, m_filterParam, m_numIntegral);
-  else if (m_idDomain == DOMAIN_FREQ)
+  else if (m_idDomain == DOMAIN_FREQUENCY)
     response = frequencyResponse (m_idFilter, m_bw, x, m_filterParam);
 
   return (response);