From 554309b2fc6a90b0f59ecb5dd4923c97c150ea36 Mon Sep 17 00:00:00 2001 From: John Glover Date: Wed, 10 Oct 2012 16:46:25 +0200 Subject: [mq] Refactor: Simplify peak detection code. --- simpl/mq.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/simpl/mq.py b/simpl/mq.py index 3a4e96f..6cfadf4 100644 --- a/simpl/mq.py +++ b/simpl/mq.py @@ -143,21 +143,18 @@ class MQPeakDetection(simpl.PeakDetection): spectrum = abs(f) # find all peaks in the spectrum - prev_mag = np.abs(spectrum[0]) - current_mag = np.abs(spectrum[1]) - next_mag = 0.0 - for bin in range(2, len(spectrum) - 1): - next_mag = np.abs(spectrum[bin]) + current_mag = spectrum[bin] + prev_mag = spectrum[bin - 1] + next_mag = spectrum[bin + 1] + if (current_mag > prev_mag and current_mag > next_mag): p = simpl.Peak() p.amplitude = current_mag - p.frequency = (bin - 1) * self._fundamental - p.phase = np.angle(f[bin - 1]) + p.frequency = bin * self._fundamental + p.phase = np.angle(f[bin]) self._current_peaks.append(p) - prev_mag = current_mag - current_mag = next_mag # sort peaks, largest amplitude first, and up to a max # of self.num_peaks peaks -- cgit v1.2.3