X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Ffilter.cpp;h=84d2e7b4e080f877d9d162973d548e70131be084;hp=6a344d42a6273957a8d847c264bcdebd438c0357;hb=980bef9b95bef1ab728634181a5672088fd47066;hpb=6435258bbafabf9a4ce4445edfd97f771318eb6d diff --git a/libctsim/filter.cpp b/libctsim/filter.cpp index 6a344d4..84d2e7b 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.14 2000/07/06 18:37:24 kevin Exp $ +** $Id: filter.cpp,v 1.23 2000/07/31 14:48:35 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 @@ -27,6 +27,99 @@ #include "ct.h" +int SignalFilter::N_INTEGRAL=500; //static member + +const int SignalFilter::FILTER_INVALID = -1 ; +const int SignalFilter::FILTER_ABS_BANDLIMIT = 0; // filter times |x = | +const int SignalFilter::FILTER_ABS_SINC = 1; +const int SignalFilter::FILTER_ABS_G_HAMMING = 2; +const int SignalFilter::FILTER_ABS_COSINE = 3; +const int SignalFilter::FILTER_SHEPP = 4; +const int SignalFilter::FILTER_BANDLIMIT = 5; +const int SignalFilter::FILTER_SINC = 6; +const int SignalFilter::FILTER_G_HAMMING = 7; +const int SignalFilter::FILTER_COSINE = 8; +const int SignalFilter::FILTER_TRIANGLE = 9; + +const char* SignalFilter::s_aszFilterName[] = { + {"abs_bandlimit"}, + {"abs_sinc"}, + {"abs_hamming"}, + {"abs_cosine"}, + {"shepp"}, + {"bandlimit"}, + {"sinc"}, + {"hamming"}, + {"cosine"}, + {"triangle"}, +}; + +const char* SignalFilter::s_aszFilterTitle[] = { + {"Abs(w) * Bandlimit"}, + {"Abs(w) * Sinc"}, + {"Abs(w) * Hamming"}, + {"Abs(w) * Cosine"}, + {"Shepp"}, + {"Bandlimit"}, + {"Sinc"}, + {"Hamming"}, + {"Cosine"}, + {"Triangle"}, +}; + +const int SignalFilter::s_iFilterCount = sizeof(s_aszFilterName) / sizeof(const char*); + +const int SignalFilter::FILTER_METHOD_INVALID = -1; +const int SignalFilter::FILTER_METHOD_CONVOLUTION = 0; +const int SignalFilter::FILTER_METHOD_FOURIER = 1; +const int SignalFilter::FILTER_METHOD_FOURIER_TABLE = 2; +const int SignalFilter::FILTER_METHOD_FFT = 3; +#if HAVE_FFTW +const int SignalFilter::FILTER_METHOD_FFTW = 4; +const int SignalFilter::FILTER_METHOD_RFFTW =5 ; +#endif + +const char* SignalFilter::s_aszFilterMethodName[] = { + {"convolution"}, + {"fourier"}, + {"fouier_table"}, + {"fft"}, +#if HAVE_FFTW + {"fftw"}, + {"rfftw"}, +#endif +}; + +const char* SignalFilter::s_aszFilterMethodTitle[] = { + {"Convolution"}, + {"Direct Fourier"}, + {"Fouier Trigometric Table Lookout"}, + {"FFT"}, +#if HAVE_FFTW + {"FFTW"}, + {"Real/Half-Complex FFTW"}, +#endif +}; + +const int SignalFilter::s_iFilterMethodCount = sizeof(s_aszFilterMethodName) / sizeof(const char*); + + +const int SignalFilter::DOMAIN_INVALID = -1; +const int SignalFilter::DOMAIN_FREQUENCY = 0; +const int SignalFilter::DOMAIN_SPATIAL = 1; + +const char* SignalFilter::s_aszDomainName[] = { + {"frequency"}, + {"spatial"}, +}; + +const char* SignalFilter::s_aszDomainTitle[] = { + {"Frequency"}, + {"Spatial"}, +}; + +const int SignalFilter::s_iDomainCount = sizeof(s_aszDomainName) / sizeof(const char*); + /* NAME * SignalFilter::SignalFilter Construct a signal @@ -40,15 +133,11 @@ * int nSignalPoints Number of points in signal * double param General input parameter to filters * 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 */ -SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName, double bw, double signalIncrement, int nSignalPoints, double param, const char* domainName, int zeropad = 0, int numIntegral = 0) +SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName, double bw, double signalIncrement, int nSignalPoints, double param, const char* domainName, int zeropad = 0, int preinterpolationFactor = 1) + : m_vecFilter(NULL), m_vecFourierCosTable(NULL), m_vecFourierSinTable(NULL), m_fail(false) { - m_vecFilter = NULL; - m_vecFourierCosTable = NULL; - m_vecFourierSinTable = NULL; m_idFilter = convertFilterNameToID (filterName); if (m_idFilter == FILTER_INVALID) { m_fail = true; @@ -70,24 +159,22 @@ SignalFilter::SignalFilter (const char* filterName, const char* filterMethodName m_failMessage += domainName; return; } - init (m_idFilter, m_idFilterMethod, bw, signalIncrement, nSignalPoints, param, m_idDomain, zeropad, numIntegral); + init (m_idFilter, m_idFilterMethod, bw, signalIncrement, nSignalPoints, param, m_idDomain, zeropad, preinterpolationFactor); } -SignalFilter::SignalFilter (const FilterID filterID, const FilterMethodID filterMethodID, double bw, double signalIncrement, int nSignalPoints, double param, const DomainID domainID, int zeropad = 0, int numIntegral = 0) +SignalFilter::SignalFilter (const int filterID, const int filterMethodID, double bw, double signalIncrement, int nSignalPoints, double param, const int domainID, int zeropad = 0, int preinterpolationFactor = 1) + : m_vecFilter(NULL), m_vecFourierCosTable(NULL), m_vecFourierSinTable(NULL), m_fail(false) { - init (filterID, filterMethodID, bw, signalIncrement, nSignalPoints, param, domainID, zeropad, numIntegral); + init (filterID, filterMethodID, bw, signalIncrement, nSignalPoints, param, domainID, zeropad, preinterpolationFactor); } -SignalFilter::SignalFilter (const char* filterName, const char* domainName, double bw, double param, int numIntegral = 0) +SignalFilter::SignalFilter (const char* filterName, const char* domainName, double bw, double param) + : m_vecFilter(NULL), m_vecFourierCosTable(NULL), m_vecFourierSinTable(NULL), m_fail(false) { m_bw = bw; m_nSignalPoints = 0; m_nFilterPoints = 0; - m_vecFilter = NULL; - m_vecFourierCosTable = NULL; - m_vecFourierSinTable = NULL; m_filterParam = param; - m_numIntegral = numIntegral; m_idFilter = convertFilterNameToID (filterName); if (m_idFilter == FILTER_INVALID) { m_fail = true; @@ -105,7 +192,7 @@ SignalFilter::SignalFilter (const char* filterName, const char* domainName, doub } void -SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID, double bw, double signalIncrement, int nSignalPoints, double param, const DomainID domainID, int zeropad, int numint) +SignalFilter::init (const int filterID, const int filterMethodID, double bw, double signalIncrement, int nSignalPoints, double filterParam, const int domainID, int zeropad, int preinterpolationFactor) { m_bw = bw; m_idFilter = filterID; @@ -119,20 +206,31 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID m_nameFilter = convertFilterIDToName (m_idFilter); m_nameDomain = convertDomainIDToName (m_idDomain); m_nameFilterMethod = convertFilterMethodIDToName (m_idFilterMethod); - m_fail = false; m_nSignalPoints = nSignalPoints; m_signalInc = signalIncrement; - m_filterParam = param; + m_filterParam = filterParam; m_zeropad = zeropad; + m_preinterpolationFactor = preinterpolationFactor; m_vecFourierCosTable = NULL; m_vecFourierSinTable = NULL; m_vecFilter = NULL; - if (m_idFilterMethod == FILTER_METHOD_FFT) - m_idFilterMethod = FILTER_METHOD_FFTW; + if (m_idFilterMethod == FILTER_METHOD_FFT) { +#if HAVE_FFTW + m_idFilterMethod = FILTER_METHOD_RFFTW; +#else + m_fail = true; + m_failMessage = "FFT not yet implemented"; + return; +#endif + } - if (m_idFilterMethod == FILTER_METHOD_FOURIER || FILTER_METHOD_FOURIER_TABLE || m_idFilterMethod == FILTER_METHOD_FFT || m_idFilterMethod == FILTER_METHOD_FFTW || m_idFilterMethod == FILTER_METHOD_RFFTW) { + if (m_idFilterMethod == FILTER_METHOD_FOURIER || m_idFilterMethod == FILTER_METHOD_FOURIER_TABLE || m_idFilterMethod == FILTER_METHOD_FFT +#if HAVE_FFTW + || m_idFilterMethod == FILTER_METHOD_FFTW || m_idFilterMethod == FILTER_METHOD_RFFTW +#endif + ) { m_nFilterPoints = m_nSignalPoints; if (m_zeropad > 0) { double logBase2 = log(m_nSignalPoints) / log(2); @@ -141,8 +239,10 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID nextPowerOf2++; nextPowerOf2 += (m_zeropad - 1); m_nFilterPoints = 1 << nextPowerOf2; - cout << "nFilterPoints = " << m_nFilterPoints << endl; + if (m_traceLevel >= TRACE_TEXT) + cout << "nFilterPoints = " << m_nFilterPoints << endl; } + m_nOutputPoints = m_nFilterPoints * m_preinterpolationFactor; m_filterMin = -1. / (2 * m_signalInc); m_filterMax = 1. / (2 * m_signalInc); m_filterInc = (m_filterMax - m_filterMin) / m_nFilterPoints; @@ -156,16 +256,16 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID // precalculate sin and cosine tables for fourier transform if (m_idFilterMethod == FILTER_METHOD_FOURIER_TABLE) { - int nFourier = m_nFilterPoints * m_nFilterPoints + 1; - double angleIncrement = (2. * PI) / m_nFilterPoints; - m_vecFourierCosTable = new double[ nFourier ]; - m_vecFourierSinTable = new double[ nFourier ]; - double angle = 0; - for (int i = 0; i < nFourier; i++) { - m_vecFourierCosTable[i] = cos (angle); - m_vecFourierSinTable[i] = sin (angle); - angle += angleIncrement; - } + int nFourier = max(m_nFilterPoints,m_nOutputPoints) * max(m_nFilterPoints, m_nOutputPoints) + 1; + double angleIncrement = (2. * PI) / m_nFilterPoints; + m_vecFourierCosTable = new double[ nFourier ]; + m_vecFourierSinTable = new double[ nFourier ]; + double angle = 0; + for (int i = 0; i < nFourier; i++) { + m_vecFourierCosTable[i] = cos (angle); + m_vecFourierSinTable[i] = sin (angle); + angle += angleIncrement; + } } #if HAVE_FFTW @@ -175,19 +275,21 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID } if (m_idFilterMethod == FILTER_METHOD_RFFTW) { - m_complexPlanForward = m_complexPlanBackward = NULL; m_realPlanForward = rfftw_create_plan (m_nFilterPoints, FFTW_REAL_TO_COMPLEX, FFTW_ESTIMATE); - m_realPlanBackward = rfftw_create_plan (m_nFilterPoints, FFTW_COMPLEX_TO_REAL, FFTW_ESTIMATE); + m_realPlanBackward = rfftw_create_plan (m_nOutputPoints, FFTW_COMPLEX_TO_REAL, FFTW_ESTIMATE); m_vecRealFftInput = new fftw_real [ m_nFilterPoints ]; + m_vecRealFftSignal = new fftw_real [ m_nOutputPoints ]; for (int i = 0; i < m_nFilterPoints; i++) m_vecRealFftInput[i] = 0; } else if (m_idFilterMethod == FILTER_METHOD_FFTW) { - m_realPlanForward = m_realPlanBackward = NULL; - m_complexPlanForward = fftw_create_plan (m_nFilterPoints, FFTW_FORWARD, FFTW_ESTIMATE); - m_complexPlanBackward = fftw_create_plan (m_nFilterPoints, FFTW_BACKWARD, FFTW_ESTIMATE); + m_complexPlanForward = fftw_create_plan (m_nFilterPoints, FFTW_FORWARD, FFTW_ESTIMATE); + m_complexPlanBackward = fftw_create_plan (m_nOutputPoints, FFTW_BACKWARD, FFTW_ESTIMATE); m_vecComplexFftInput = new fftw_complex [ m_nFilterPoints ]; + m_vecComplexFftSignal = new fftw_complex [ m_nOutputPoints ]; for (int i = 0; i < m_nFilterPoints; i++) m_vecComplexFftInput[i].re = m_vecComplexFftInput[i].im = 0; + for (int i = 0; i < m_nOutputPoints; i++) + m_vecComplexFftSignal[i].re = m_vecComplexFftSignal[i].im = 0; } #endif @@ -196,7 +298,6 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID m_filterMin = -m_signalInc * (m_nSignalPoints - 1); m_filterMax = m_signalInc * (m_nSignalPoints - 1); m_filterInc = (m_filterMax - m_filterMin) / (m_nFilterPoints - 1); - m_numIntegral = numint; m_vecFilter = new double[ m_nFilterPoints ]; if (m_idFilter == FILTER_SHEPP) { @@ -212,15 +313,20 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID double x; int i; for (x = m_filterMin, i = 0; i < m_nFilterPoints; x += m_filterInc, i++) - m_vecFilter[i] = frequencyResponse (x, param); + m_vecFilter[i] = frequencyResponse (x, m_filterParam); } else if (m_idDomain == DOMAIN_SPATIAL) { double x; int i; - for (x = m_filterMin, i = 0; i < m_nFilterPoints; x += m_filterInc, i++) - if (numint == 0) - m_vecFilter[i] = spatialResponseAnalytic (x, param); + for (x = m_filterMin, i = 0; i < m_nFilterPoints; x += m_filterInc, i++) { + if (haveAnalyticSpatial(m_idFilter)) + m_vecFilter[i] = spatialResponseAnalytic (x, m_filterParam); else - m_vecFilter[i] = spatialResponseCalc (x, param, numint); + m_vecFilter[i] = spatialResponseCalc (x, m_filterParam); +#if LIMIT_BANDWIDTH_TRIAL + if (i < m_nFilterPoints / 4 || i > (m_nFilterPoints * 3) / 4) + m_vecFilter[i] = 0; +#endif + } } else { m_failMessage = "Illegal domain name "; m_failMessage += m_idDomain; @@ -240,142 +346,125 @@ SignalFilter::~SignalFilter (void) fftw_destroy_plan(m_complexPlanForward); fftw_destroy_plan(m_complexPlanBackward); delete [] m_vecComplexFftInput; + delete [] m_vecComplexFftSignal; } if (m_idFilterMethod == FILTER_METHOD_RFFTW) { rfftw_destroy_plan(m_realPlanForward); rfftw_destroy_plan(m_realPlanBackward); delete [] m_vecRealFftInput; + delete [] m_vecRealFftSignal; } #endif } -const SignalFilter::FilterID +int SignalFilter::convertFilterNameToID (const char *filterName) { - FilterID filterID = FILTER_INVALID; - - if (strcasecmp (filterName, FILTER_BANDLIMIT_STR) == 0) - filterID = FILTER_BANDLIMIT; - else if (strcasecmp (filterName, FILTER_HAMMING_STR) == 0) - filterID = FILTER_G_HAMMING; - else if (strcasecmp (filterName, FILTER_SINC_STR) == 0) - filterID = FILTER_SINC; - else if (strcasecmp (filterName, FILTER_COS_STR) == 0) - filterID = FILTER_COSINE; - else if (strcasecmp (filterName, FILTER_TRIANGLE_STR) == 0) - filterID = FILTER_TRIANGLE; - else if (strcasecmp (filterName, FILTER_ABS_BANDLIMIT_STR) == 0) - filterID = FILTER_ABS_BANDLIMIT; - else if (strcasecmp (filterName, FILTER_ABS_HAMMING_STR) == 0) - filterID = FILTER_ABS_G_HAMMING; - else if (strcasecmp (filterName, FILTER_ABS_SINC_STR) == 0) - filterID = FILTER_ABS_SINC; - else if (strcasecmp (filterName, FILTER_ABS_COS_STR) == 0) - filterID = FILTER_ABS_COSINE; - else if (strcasecmp (filterName, FILTER_SHEPP_STR) == 0) - filterID = FILTER_SHEPP; + int filterID = FILTER_INVALID; + + for (int i = 0; i < s_iFilterCount; i++) + if (strcasecmp (filterName, s_aszFilterName[i]) == 0) { + filterID = i; + break; + } return (filterID); } const char * -SignalFilter::convertFilterIDToName (const FilterID filterID) -{ - const char *name = ""; - - if (filterID == FILTER_SHEPP) - name = FILTER_SHEPP_STR; - else if (filterID == FILTER_ABS_COSINE) - name = FILTER_ABS_COS_STR; - else if (filterID == FILTER_ABS_SINC) - name = FILTER_ABS_SINC_STR; - else if (filterID == FILTER_ABS_G_HAMMING) - name = FILTER_ABS_HAMMING_STR; - else if (filterID == FILTER_ABS_BANDLIMIT) - name = FILTER_ABS_BANDLIMIT_STR; - else if (filterID == FILTER_COSINE) - name = FILTER_COS_STR; - else if (filterID == FILTER_SINC) - name = FILTER_SINC_STR; - else if (filterID == FILTER_G_HAMMING) - name = FILTER_HAMMING_STR; - else if (filterID == FILTER_BANDLIMIT) - name = FILTER_BANDLIMIT_STR; - else if (filterID == FILTER_TRIANGLE) - name = FILTER_TRIANGLE_STR; - +SignalFilter::convertFilterIDToName (const int filterID) +{ + static const char *name = ""; + + if (filterID >= 0 && filterID < s_iFilterCount) + return (s_aszFilterName [filterID]); + return (name); } + +const char * +SignalFilter::convertFilterIDToTitle (const int filterID) +{ + static const char *title = ""; + + if (filterID >= 0 && filterID < s_iFilterCount) + return (s_aszFilterTitle [filterID]); + + return (title); +} -const SignalFilter::FilterMethodID +int SignalFilter::convertFilterMethodNameToID (const char* const filterMethodName) { - FilterMethodID fmID = FILTER_METHOD_INVALID; - - if (strcasecmp (filterMethodName, FILTER_METHOD_CONVOLUTION_STR) == 0) - fmID = FILTER_METHOD_CONVOLUTION; - else if (strcasecmp (filterMethodName, FILTER_METHOD_FOURIER_STR) == 0) - fmID = FILTER_METHOD_FOURIER; - else if (strcasecmp (filterMethodName, FILTER_METHOD_FOURIER_TABLE_STR) == 0) - fmID = FILTER_METHOD_FOURIER_TABLE; - else if (strcasecmp (filterMethodName, FILTER_METHOD_FFT_STR) == 0) - fmID = FILTER_METHOD_FFT; - else if (strcasecmp (filterMethodName, FILTER_METHOD_FFTW_STR) == 0) - fmID = FILTER_METHOD_FFTW; - else if (strcasecmp (filterMethodName, FILTER_METHOD_RFFTW_STR) == 0) - fmID = FILTER_METHOD_RFFTW; + int fmID = FILTER_METHOD_INVALID; + + for (int i = 0; i < s_iFilterMethodCount; i++) + if (strcasecmp (filterMethodName, s_aszFilterMethodName[i]) == 0) { + fmID = i; + break; + } return (fmID); } const char * -SignalFilter::convertFilterMethodIDToName (const FilterMethodID fmID) -{ - const char *name = ""; - - if (fmID == FILTER_METHOD_CONVOLUTION) - return (FILTER_METHOD_CONVOLUTION_STR); - else if (fmID == FILTER_METHOD_FOURIER) - return (FILTER_METHOD_FOURIER_STR); - else if (fmID == FILTER_METHOD_FOURIER_TABLE) - return (FILTER_METHOD_FOURIER_TABLE_STR); - else if (fmID == FILTER_METHOD_FFT) - return (FILTER_METHOD_FFT_STR); - else if (fmID == FILTER_METHOD_FFTW) - return (FILTER_METHOD_FFTW_STR); - else if (fmID == FILTER_METHOD_RFFTW) - return (FILTER_METHOD_RFFTW_STR); +SignalFilter::convertFilterMethodIDToName (const int fmID) +{ + static const char *name = ""; + + if (fmID >= 0 && fmID < s_iFilterMethodCount) + return (s_aszFilterMethodName [fmID]); return (name); } -const SignalFilter::DomainID +const char * +SignalFilter::convertFilterMethodIDToTitle (const int fmID) +{ + static const char *title = ""; + + if (fmID >= 0 && fmID < s_iFilterMethodCount) + return (s_aszFilterTitle [fmID]); + + return (title); +} + +int SignalFilter::convertDomainNameToID (const char* const domainName) { - DomainID dID = DOMAIN_INVALID; + int dID = DOMAIN_INVALID; - if (strcasecmp (domainName, DOMAIN_SPATIAL_STR) == 0) - dID = DOMAIN_SPATIAL; - else if (strcasecmp (domainName, DOMAIN_FREQUENCY_STR) == 0) - dID = DOMAIN_FREQUENCY; + for (int i = 0; i < s_iDomainCount; i++) + if (strcasecmp (domainName, s_aszDomainName[i]) == 0) { + dID = i; + break; + } return (dID); } const char * -SignalFilter::convertDomainIDToName (const DomainID domain) +SignalFilter::convertDomainIDToName (const int domainID) { - const char *name = ""; + static const char *name = ""; - if (domain == DOMAIN_SPATIAL) - return (DOMAIN_SPATIAL_STR); - else if (domain == DOMAIN_FREQUENCY) - return (DOMAIN_FREQUENCY_STR); + if (domainID >= 0 && domainID < s_iDomainCount) + return (s_aszDomainName [domainID]); return (name); } +const char * +SignalFilter::convertDomainIDToTitle (const int domainID) +{ + static const char *title = ""; + + if (domainID >= 0 && domainID < s_iDomainCount) + return (s_aszDomainTitle [domainID]); + + return (title); +} void SignalFilter::filterSignal (const float input[], double output[]) const @@ -391,10 +480,10 @@ SignalFilter::filterSignal (const float input[], double output[]) const inputSignal[i] = 0; // zeropad complex fftSignal[m_nFilterPoints]; finiteFourierTransform (inputSignal, fftSignal, m_nFilterPoints, -1); - complex filteredSignal[m_nFilterPoints]; - dotProduct (m_vecFilter, fftSignal, filteredSignal, m_nFilterPoints); + for (int i = 0; i < m_nFilterPoints; i++) + fftSignal[i] *= m_vecFilter[i]; double inverseFourier[m_nFilterPoints]; - finiteFourierTransform (filteredSignal, inverseFourier, m_nFilterPoints, 1); + finiteFourierTransform (fftSignal, inverseFourier, m_nFilterPoints, 1); for (int i = 0; i < m_nSignalPoints; i++) output[i] = inverseFourier[i]; } else if (m_idFilterMethod == FILTER_METHOD_FOURIER_TABLE) { @@ -405,10 +494,10 @@ SignalFilter::filterSignal (const float input[], double output[]) const inputSignal[i] = 0; // zeropad complex fftSignal[m_nFilterPoints]; finiteFourierTransform (inputSignal, fftSignal, -1); - complex filteredSignal[m_nFilterPoints]; - dotProduct (m_vecFilter, fftSignal, filteredSignal, m_nFilterPoints); + for (int i = 0; i < m_nFilterPoints; i++) + fftSignal[i] *= m_vecFilter[i]; double inverseFourier[m_nFilterPoints]; - finiteFourierTransform (filteredSignal, inverseFourier, 1); + finiteFourierTransform (fftSignal, inverseFourier, 1); for (int i = 0; i < m_nSignalPoints; i++) output[i] = inverseFourier[i]; } @@ -417,29 +506,31 @@ SignalFilter::filterSignal (const float input[], double output[]) const for (int i = 0; i < m_nSignalPoints; i++) m_vecRealFftInput[i] = input[i]; - fftw_real out[m_nFilterPoints]; - rfftw_one (m_realPlanForward, m_vecRealFftInput, out); - for (int i = 0; i < m_nFilterPoints; i++) { - out[i] *= m_vecFilter[i]; - } - fftw_real outFiltered[m_nFilterPoints]; - rfftw_one(m_realPlanBackward, out, outFiltered); - for (int i = 0; i < m_nSignalPoints; i++) - output[i] = outFiltered[i]; + fftw_real fftOutput [ m_nFilterPoints ]; + rfftw_one (m_realPlanForward, m_vecRealFftInput, fftOutput); + for (int i = 0; i < m_nFilterPoints; i++) + m_vecRealFftSignal[i] = m_vecFilter[i] * fftOutput[i]; + for (int i = m_nFilterPoints; i < m_nOutputPoints; i++) + m_vecRealFftSignal[i] = 0; + + fftw_real ifftOutput [ m_nOutputPoints ]; + rfftw_one(m_realPlanBackward, m_vecRealFftSignal, ifftOutput); + for (int i = 0; i < m_nSignalPoints * m_preinterpolationFactor; i++) + output[i] = ifftOutput[i]; } else if (m_idFilterMethod == FILTER_METHOD_FFTW) { for (int i = 0; i < m_nSignalPoints; i++) m_vecComplexFftInput[i].re = input[i]; - fftw_complex out[m_nFilterPoints]; - fftw_one(m_complexPlanForward, m_vecComplexFftInput, out); + fftw_complex fftOutput [ m_nFilterPoints ]; + fftw_one(m_complexPlanForward, m_vecComplexFftInput, fftOutput); for (int i = 0; i < m_nFilterPoints; i++) { - out[i].re *= m_vecFilter[i]; - out[i].im *= m_vecFilter[i]; + m_vecComplexFftSignal[i].re = m_vecFilter[i] * fftOutput[i].re; + m_vecComplexFftSignal[i].im = m_vecFilter[i] * fftOutput[i].im; } - fftw_complex outFiltered[m_nFilterPoints]; - fftw_one(m_complexPlanBackward, out, outFiltered); - for (int i = 0; i < m_nSignalPoints; i++) - output[i] = outFiltered[i].re; + fftw_complex ifftOutput [ m_nOutputPoints ]; + fftw_one(m_complexPlanBackward, m_vecComplexFftSignal, ifftOutput); + for (int i = 0; i < m_nSignalPoints * m_preinterpolationFactor; i++) + output[i] = ifftOutput[i].re; } #endif } @@ -450,7 +541,7 @@ SignalFilter::response (double x) double response = 0; if (m_idDomain == DOMAIN_SPATIAL) - response = spatialResponse (m_idFilter, m_bw, x, m_filterParam, m_numIntegral); + response = spatialResponse (m_idFilter, m_bw, x, m_filterParam); else if (m_idDomain == DOMAIN_FREQUENCY) response = frequencyResponse (m_idFilter, m_bw, x, m_filterParam); @@ -459,12 +550,12 @@ SignalFilter::response (double x) double -SignalFilter::spatialResponse (FilterID filterID, double bw, double x, double param, int nIntegral = 0) +SignalFilter::spatialResponse (int filterID, double bw, double x, double param) { - if (nIntegral == 0) + if (haveAnalyticSpatial(filterID)) return spatialResponseAnalytic (filterID, bw, x, param); else - return spatialResponseCalc (filterID, bw, x, param, nIntegral); + return spatialResponseCalc (filterID, bw, x, param, N_INTEGRAL); } /* NAME @@ -483,13 +574,13 @@ SignalFilter::spatialResponse (FilterID filterID, double bw, double x, double pa */ double -SignalFilter::spatialResponseCalc (double x, double param, int nIntegral) const +SignalFilter::spatialResponseCalc (double x, double param) const { - return (spatialResponseCalc (m_idFilter, m_bw, x, param, nIntegral)); + return (spatialResponseCalc (m_idFilter, m_bw, x, param, N_INTEGRAL)); } double -SignalFilter::spatialResponseCalc (FilterID filterID, double bw, double x, double param, int n) +SignalFilter::spatialResponseCalc (int filterID, double bw, double x, double param, int n) { double zmin, zmax; @@ -533,7 +624,7 @@ SignalFilter::frequencyResponse (double u, double param) const double -SignalFilter::frequencyResponse (FilterID filterID, double bw, double u, double param) +SignalFilter::frequencyResponse (int filterID, double bw, double u, double param) { double q; double au = fabs (u); @@ -617,8 +708,32 @@ SignalFilter::spatialResponseAnalytic (double x, double param) const return spatialResponseAnalytic (m_idFilter, m_bw, x, param); } +const bool +SignalFilter::haveAnalyticSpatial (int filterID) +{ + bool haveAnalytic = false; + + switch (filterID) { + case FILTER_BANDLIMIT: + case FILTER_TRIANGLE: + case FILTER_COSINE: + case FILTER_G_HAMMING: + case FILTER_ABS_BANDLIMIT: + case FILTER_ABS_COSINE: + case FILTER_ABS_G_HAMMING: + case FILTER_SHEPP: + case FILTER_SINC: + haveAnalytic = true; + break; + default: + break; + } + + return (haveAnalytic); +} + double -SignalFilter::spatialResponseAnalytic (FilterID filterID, double bw, double x, double param) +SignalFilter::spatialResponseAnalytic (int filterID, double bw, double x, double param) { double q, temp; double u = TWOPI * x; @@ -930,9 +1045,3 @@ SignalFilter::finiteFourierTransform (const complex input[], double outp } -void -SignalFilter::dotProduct (const double v1[], const complex v2[], complex output[], const int n) -{ - for (int i = 0; i < n; i++) - output[i] = v1[i] * v2[i]; -}