diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-09-02 09:33:32 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-09-02 09:33:32 -0700 |
| commit | 12b02687d8504adc6efb747a51d3c2fa77a21d63 (patch) | |
| tree | 30d420ca7bf36aec579ad0329101e2574132bb37 /gnuradio-core/src | |
| parent | 31c94994fa22a9d5f8584449edee4e86013ae916 (diff) | |
| parent | 0c68c486ec09da471c27b6f4d658ae0ba8f861b7 (diff) | |
Merge branch 'wxgui' from http://gnuradio.org/git/jblum.git into master
* 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/src')
| -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 cf8eb1be78..7ef40be40a 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 |