From: Kevin M. Rosenberg Date: Wed, 5 Jul 2000 17:24:33 +0000 (+0000) Subject: r133: *** empty log message *** X-Git-Tag: debian-4.5.3-3~884 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=0dd14de503a36bb52c24625f8eac4e7163c7d068 r133: *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 5c73152..850cc8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ -2.0.0 - 7/07/00 +2.0.0 - 7/05/00 Update trace level processing Added trace level to SignalFilter + Fixed magnitude vs. real output bug in FFT/Fourier filter 1.9.9 - 7/04/00 Fixed const issue with ImageFileArray diff --git a/configure b/configure index 1c3e0c3..4ec3834 100755 --- a/configure +++ b/configure @@ -710,7 +710,7 @@ fi PACKAGE=ctsim -VERSION=1.9.9 +VERSION=2.0.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/configure.in b/configure.in index e96baa4..e28b714 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout dnl CDPATH= AC_INIT(src/pjrec.cpp) -AM_INIT_AUTOMAKE(ctsim,1.9.9) +AM_INIT_AUTOMAKE(ctsim,2.0.0) AM_CONFIG_HEADER(config.h) dnl Checks for programs. diff --git a/libctsim/filter.cpp b/libctsim/filter.cpp index 640bfb2..2d31525 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.10 2000/07/05 01:34:46 kevin Exp $ +** $Id: filter.cpp,v 1.11 2000/07/05 17:24:33 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 @@ -142,7 +142,7 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID for (int i = 0; i < halfFilter; i++) m_vecFilter[i] = static_cast(i) / (halfFilter - 1) / (2 * m_signalInc); for (int i = 0; i < halfFilter; i++) - m_vecFilter[m_nFilterPoints - i - 1] = static_cast(i) / (halfFilter - 1) / (2 * m_signalInc); + m_vecFilter[m_nFilterPoints - i - 1] = static_cast(i+1) / (halfFilter - 1) / (2 * m_signalInc); if (halfFilter % 2) // odd m_vecFilter[halfFilter] = 1 / (2 * m_signalInc); } else if (m_idFilterMethod == FILTER_METHOD_FFT || m_idFilterMethod == FILTER_METHOD_FFT_ZEROPAD_2 || m_idFilterMethod == FILTER_METHOD_FFT_ZEROPAD_4) { @@ -163,11 +163,11 @@ SignalFilter::init (const FilterID filterID, const FilterMethodID filterMethodID m_vecFilter = new double [m_nFilterPoints]; int halfFilter = m_nFilterPoints / 2; for (int i = 0; i < halfFilter; i++) - m_vecFilter[i] = static_cast(i) / (halfFilter - 1) / (2 * m_signalInc); + m_vecFilter[i] = static_cast(i) / (halfFilter - 1) / (2 * m_signalInc) / m_nSignalPoints; for (int i = 0; i < halfFilter; i++) - m_vecFilter[m_nFilterPoints - i - 1] = static_cast(i) / (halfFilter - 1) / (2 * m_signalInc); + m_vecFilter[m_nFilterPoints - i - 1] = static_cast(i+1) / (halfFilter - 1) / (2 * m_signalInc) / m_nSignalPoints; if (halfFilter % 2) // odd - m_vecFilter[halfFilter] = 1 / (2 * m_signalInc); + m_vecFilter[halfFilter] = 1 / (2 * m_signalInc) / m_nSignalPoints; #if HAVE_FFTW m_planForward = fftw_create_plan (m_nFilterPoints, FFTW_FORWARD, FFTW_ESTIMATE); @@ -365,24 +365,10 @@ SignalFilter::filterSignal (const float input[], double output[]) const complex complexOutput[m_nSignalPoints]; complex filteredSignal[m_nSignalPoints]; finiteFourierTransform (input, fftSignal, m_nSignalPoints, -1); - if (m_traceLevel >= TRACE_PLOT) { - double test[m_nSignalPoints]; - for (int i = 0; i < m_nSignalPoints; i++) - test[i] = abs(fftSignal[i]); - ezplot_1d(test, m_nSignalPoints); - cio_kb_getc(); - } dotProduct (m_vecFilter, fftSignal, filteredSignal, m_nSignalPoints); - if (m_traceLevel >= TRACE_PLOT) { - double test[m_nSignalPoints]; - for (int i = 0; i < m_nSignalPoints; i++) - test[i] = abs(filteredSignal[i]); - ezplot_1d(test, m_nSignalPoints); - cio_kb_getc(); - } finiteFourierTransform (filteredSignal, complexOutput, m_nSignalPoints, 1); for (int i = 0; i < m_nSignalPoints; i++) - output[i] = abs( complexOutput[i] ); + output[i] = complexOutput[i].real(); } else if (m_idFilterMethod == FILTER_METHOD_FFT || FILTER_METHOD_FFT_ZEROPAD_2 || FILTER_METHOD_FFT_ZEROPAD_4) { fftw_complex in[m_nFilterPoints], out[m_nFilterPoints]; for (int i = 0; i < m_nSignalPoints; i++) { @@ -393,34 +379,13 @@ SignalFilter::filterSignal (const float input[], double output[]) const in[i].re = in[i].im = 0; // ZeroPad } fftw_one(m_planForward, in, out); - if (m_traceLevel >= TRACE_PLOT) { - double test[m_nFilterPoints]; - for (int i = 0; i < m_nFilterPoints; i++) - test[i] = sqrt(out[i].re * out[i].re + out[i].im * out[i].im); - ezplot_1d(test, m_nFilterPoints); - cio_kb_getc(); - } for (int i = 0; i < m_nFilterPoints; i++) { - out[i].re = m_vecFilter[i] * out[i].re / m_nSignalPoints; - out[i].im = m_vecFilter[i] * out[i].im / m_nSignalPoints; - } - if (m_traceLevel >= TRACE_PLOT) { - double test[m_nFilterPoints]; - for (int i = 0; i < m_nFilterPoints; i++) - test[i] = sqrt(out[i].re * out[i].re + out[i].im * out[i].im); - ezplot_1d(test, m_nFilterPoints); - cio_kb_getc(); + out[i].re = m_vecFilter[i] * out[i].re; + out[i].im = m_vecFilter[i] * out[i].im; } fftw_one(m_planBackward, out, in); - if (m_traceLevel >= TRACE_PLOT) { - double test[m_nFilterPoints]; - for (int i = 0; i < m_nFilterPoints; i++) - test[i] = sqrt(in[i].re * in[i].re + in[i].im * in[i].im); - ezplot_1d(test, m_nFilterPoints); - cio_kb_getc(); - } for (int i = 0; i < m_nSignalPoints; i++) - output[i] = sqrt (in[i].re * in[i].re + in[i].im * in[i].im); + output[i] = in[i].re; } }