diff options
author | Matt Ettus | 2009-09-04 10:29:00 -0700 |
---|---|---|
committer | Matt Ettus | 2009-09-04 10:29:00 -0700 |
commit | e103e18f8b8111cd07edc2bb0294aa58a426e371 (patch) | |
tree | 429d96819fc8b04c965eda3a0c2b93f2e94f9080 /gnuradio-core/src/python | |
parent | 5965a434d0923738d49334eb5f3d74a259e7b431 (diff) | |
parent | 20006003431d7260b04964eb684b1746ffb0a85f (diff) | |
download | gnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.tar.gz gnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.tar.bz2 gnuradio-e103e18f8b8111cd07edc2bb0294aa58a426e371.zip |
Merge branch 'master' into new_eth
Diffstat (limited to 'gnuradio-core/src/python')
-rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py b/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py index cf8eb1be7..7ef40be40 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py @@ -55,9 +55,9 @@ class _logpwrfft_base(gr.hier_block2): c2mag = gr.complex_to_mag(fft_size) self._avg = gr.single_pole_iir_filter_ff(1.0, fft_size) self._log = gr.nlog10_ff(20, fft_size, - -10*math.log10(fft_size) # Adjust for number of bins + -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)) # Adjust for reference scale + -20*math.log10(ref_scale/2)+3.0) # Adjust for reference scale self.connect(self, self._sd, fft, c2mag, self._avg, self._log, self) self._average = average |