diff options
| author | Josh Morman <jmorman@gnuradio.org> | 2021-11-24 12:33:26 -0500 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-11-24 14:41:53 -0500 |
| commit | b4aaa48f69239e16341a59628ca7795cfeebb4da (patch) | |
| tree | 4f54b7bb7d4f6cf49d3eb8951f238987b4221412 /gr-fft/python/fft | |
| parent | c747e37751546159f30a2a1296dc4099fe132a53 (diff) | |
fft: pep8 formatting
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
Diffstat (limited to 'gr-fft/python/fft')
| -rw-r--r-- | gr-fft/python/fft/__init__.py | 2 | ||||
| -rw-r--r-- | gr-fft/python/fft/logpwrfft.py | 48 |
2 files changed, 29 insertions, 21 deletions
diff --git a/gr-fft/python/fft/__init__.py b/gr-fft/python/fft/__init__.py index bb370a333a..7e12455c99 100644 --- a/gr-fft/python/fft/__init__.py +++ b/gr-fft/python/fft/__init__.py @@ -22,4 +22,4 @@ except ImportError: from .fft_python import * from .fft_vcc import fft_vcc -from .fft_vfc import fft_vfc
\ No newline at end of file +from .fft_vfc import fft_vfc diff --git a/gr-fft/python/fft/logpwrfft.py b/gr-fft/python/fft/logpwrfft.py index 82f852e190..f82fa06a8e 100644 --- a/gr-fft/python/fft/logpwrfft.py +++ b/gr-fft/python/fft/logpwrfft.py @@ -9,7 +9,8 @@ from gnuradio import gr from gnuradio import blocks -import sys, math +import sys +import math from . import fft_python as fft from . import fft_vfc, fft_vcc @@ -21,6 +22,7 @@ except ImportError: sys.stderr.write('fft.logpwrfft required gr-filter.\n') sys.exit(1) + class _logpwrfft_base(gr.hier_block2): """ Create a log10(abs(fft)) stream chain, with real or complex input. @@ -42,24 +44,28 @@ class _logpwrfft_base(gr.hier_block2): shift: shift zero-frequency component to center of spectrum """ gr.hier_block2.__init__(self, self._name, - gr.io_signature(1, 1, self._item_size), # Input signature - gr.io_signature(1, 1, gr.sizeof_float*fft_size)) # Output signature + # Input signature + gr.io_signature(1, 1, self._item_size), + gr.io_signature(1, 1, gr.sizeof_float * fft_size)) # Output signature self._sd = blocks.stream_to_vector_decimator(item_size=self._item_size, sample_rate=sample_rate, vec_rate=frame_rate, vec_len=fft_size) - if win is None: win = window.blackmanharris + if win is None: + win = window.blackmanharris fft_window = win(fft_size) fft = self._fft_block[0](fft_size, True, fft_window, shift=shift) - window_power = sum([x*x for x in fft_window]) + window_power = sum([x * x for x in fft_window]) c2magsq = blocks.complex_to_mag_squared(fft_size) 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(float(window_power) / fft_size) # Adjust for windowing loss - -20*math.log10(float(ref_scale) / 2)) # Adjust for reference scale + # Adjust for number of bins + -20 * math.log10(fft_size) - + # Adjust for windowing loss + 10 * math.log10(float(window_power) / fft_size) - + 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 @@ -147,18 +153,20 @@ class _logpwrfft_base(gr.hier_block2): """ return self._avg_alpha + class logpwrfft_f(_logpwrfft_base): - """ - Create an fft block chain, with real input. - """ - _name = "logpwrfft_f" - _item_size = gr.sizeof_float - _fft_block = (fft_vfc, ) + """ + Create an fft block chain, with real input. + """ + _name = "logpwrfft_f" + _item_size = gr.sizeof_float + _fft_block = (fft_vfc, ) + class logpwrfft_c(_logpwrfft_base): - """ - Create an fft block chain, with complex input. - """ - _name = "logpwrfft_c" - _item_size = gr.sizeof_gr_complex - _fft_block = (fft_vcc, ) + """ + Create an fft block chain, with complex input. + """ + _name = "logpwrfft_c" + _item_size = gr.sizeof_gr_complex + _fft_block = (fft_vcc, ) |