summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authorJosh Blum2009-08-31 18:18:22 -0700
committerJosh Blum2009-08-31 18:18:22 -0700
commit0c68c486ec09da471c27b6f4d658ae0ba8f861b7 (patch)
treed77864cb2bbb8e2d099d9d2d05da2ee823c53045 /gnuradio-core
parent1aa216df204197b4849581dd4f42b2e7680eb72f (diff)
downloadgnuradio-0c68c486ec09da471c27b6f4d658ae0ba8f861b7.tar.gz
gnuradio-0c68c486ec09da471c27b6f4d658ae0ba8f861b7.tar.bz2
gnuradio-0c68c486ec09da471c27b6f4d658ae0ba8f861b7.zip
Modified log power fft block so ref scale is peak to peak.
Tweaked fft sink autoscale routine to come up with better numbers. Modified scope sink ac couple block to use constant tap. The previous tap calculation would cause failure for very small sample rates.
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py4
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