diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-14 15:15:57 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-14 15:15:57 -0700 |
| commit | 7f3bc9cf41bae6c5ddccf4e0f1ce225458fa5fe8 (patch) | |
| tree | 199326f0678453247ea573e88e2e1fbc82caf3c1 /gr-fft | |
| parent | 5869dba3e8a9cefc1203ec9037e01e95a847f7f0 (diff) | |
| parent | b2a280a9ad4ad13f958fc2e09e29f8afe48b0473 (diff) | |
Merge branch 'next' into python3
Conflicts:
gr-fft/python/fft/logpwrfft.py
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/python/fft/logpwrfft.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-fft/python/fft/logpwrfft.py b/gr-fft/python/fft/logpwrfft.py index ee424f2f84..3c568b67e4 100644 --- a/gr-fft/python/fft/logpwrfft.py +++ b/gr-fft/python/fft/logpwrfft.py @@ -71,8 +71,8 @@ class _logpwrfft_base(gr.hier_block2): self._avg = filter.single_pole_iir_filter_ff(1.0, fft_size) self._log = blocks.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)) # Adjust for reference scale + -10*math.log10(float(window_power) / fft_size) # Adjust for windowing loss + -20*math.log10(float(ref_scale) / 2)) # Adjust for reference scale self.connect(self, self._sd, fft, c2magsq, self._avg, self._log, self) self._average = average |