diff options
| author | Tom Rondeau | 2011-09-08 10:58:05 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-09-08 10:58:05 -0400 |
| commit | bef3c39119ade000abde89bb29a9ba7f0dfd2de8 (patch) | |
| tree | f9853dcd4172d04b043a02ee6ccd485cbae7d54a | |
| parent | 492446d2ec6ed85d6437bb35caf4700b02930147 (diff) | |
| parent | f230d8cf60eccfc4f38c863943cf32d106d09d0b (diff) | |
| download | gnuradio-bef3c39119ade000abde89bb29a9ba7f0dfd2de8.tar.gz gnuradio-bef3c39119ade000abde89bb29a9ba7f0dfd2de8.tar.bz2 gnuradio-bef3c39119ade000abde89bb29a9ba7f0dfd2de8.zip | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py b/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py index 200c4cfbe..6f7fc520f 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py @@ -54,13 +54,13 @@ class _logpwrfft_base(gr.hier_block2): fft = self._fft_block[0](fft_size, True, fft_window) window_power = sum(map(lambda x: x*x, fft_window)) - c2mag = gr.complex_to_mag(fft_size) + c2magsq = gr.complex_to_mag_squared(fft_size) self._avg = gr.single_pole_iir_filter_ff(1.0, fft_size) - self._log = gr.nlog10_ff(20, fft_size, + self._log = gr.nlog10_ff(10, fft_size, -20*math.log10(fft_size) # Adjust for number of bins -10*math.log10(window_power/fft_size) # Adjust for windowing loss - -20*math.log10(ref_scale/2)+3.0) # Adjust for reference scale - self.connect(self, self._sd, fft, c2mag, self._avg, self._log, self) + -20*math.log10(ref_scale/2)) # Adjust for reference scale + self.connect(self, self._sd, fft, c2magsq, self._avg, self._log, self) self._average = average self._avg_alpha = avg_alpha |