diff options
author | Josh Morman <jmorman@gnuradio.org> | 2021-11-24 12:05:50 -0500 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-11-24 14:41:53 -0500 |
commit | 310b7f0cc25edf90c0bc6754031d763119b0ae97 (patch) | |
tree | 66374c8076dfeedb38f2de0f9cb0a0a0059f738d | |
parent | 25e2e7287b20e8dd8e5cf9c0fe07eb754b81c10c (diff) |
channels: pep8 formatting
Signed-off-by: Josh Morman <jmorman@gnuradio.org>
-rw-r--r-- | gr-channels/python/channels/amp_bal.py | 28 | ||||
-rw-r--r-- | gr-channels/python/channels/conj_fs_iqcorr.py | 18 | ||||
-rw-r--r-- | gr-channels/python/channels/distortion_2_gen.py | 23 | ||||
-rw-r--r-- | gr-channels/python/channels/distortion_3_gen.py | 27 | ||||
-rw-r--r-- | gr-channels/python/channels/impairments.py | 22 | ||||
-rw-r--r-- | gr-channels/python/channels/iqbal_gen.py | 23 | ||||
-rw-r--r-- | gr-channels/python/channels/phase_bal.py | 55 | ||||
-rw-r--r-- | gr-channels/python/channels/phase_noise_gen.py | 34 | ||||
-rw-r--r-- | gr-channels/python/channels/quantizer.py | 30 |
9 files changed, 141 insertions, 119 deletions
diff --git a/gr-channels/python/channels/amp_bal.py b/gr-channels/python/channels/amp_bal.py index 30e0f0d8e2..ec6025b4d8 100644 --- a/gr-channels/python/channels/amp_bal.py +++ b/gr-channels/python/channels/amp_bal.py @@ -11,13 +11,14 @@ from gnuradio import blocks from gnuradio import gr from gnuradio.filter import firdes + class amp_bal(gr.hier_block2): def __init__(self, alpha=0): gr.hier_block2.__init__( self, "Amplitude Balance", - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), ) ################################################## @@ -40,17 +41,20 @@ class amp_bal(gr.hier_block2): ################################################## self.connect((self.blocks_float_to_complex, 0), (self, 0)) self.connect((self, 0), (self.blocks_complex_to_float, 0)) - self.connect((self.blocks_complex_to_float, 0), (self.blocks_rms_xx, 0)) - self.connect((self.blocks_complex_to_float, 1), (self.blocks_rms_xx0, 0)) + self.connect((self.blocks_complex_to_float, 0), + (self.blocks_rms_xx, 0)) + self.connect((self.blocks_complex_to_float, 1), + (self.blocks_rms_xx0, 0)) self.connect((self.blocks_rms_xx, 0), (self.blocks_divide_xx, 0)) self.connect((self.blocks_rms_xx0, 0), (self.blocks_divide_xx, 1)) - self.connect((self.blocks_complex_to_float, 0), (self.blocks_float_to_complex, 0)) - self.connect((self.blocks_complex_to_float, 1), (self.blocks_multiply_vxx1, 1)) - self.connect((self.blocks_divide_xx, 0), (self.blocks_multiply_vxx1, 0)) - self.connect((self.blocks_multiply_vxx1, 0), (self.blocks_float_to_complex, 1)) - - -# QT sink close method reimplementation + self.connect((self.blocks_complex_to_float, 0), + (self.blocks_float_to_complex, 0)) + self.connect((self.blocks_complex_to_float, 1), + (self.blocks_multiply_vxx1, 1)) + self.connect((self.blocks_divide_xx, 0), + (self.blocks_multiply_vxx1, 0)) + self.connect((self.blocks_multiply_vxx1, 0), + (self.blocks_float_to_complex, 1)) def get_alpha(self): return self.alpha @@ -59,5 +63,3 @@ class amp_bal(gr.hier_block2): self.alpha = alpha self.blocks_rms_xx.set_alpha(self.alpha) self.blocks_rms_xx0.set_alpha(self.alpha) - - diff --git a/gr-channels/python/channels/conj_fs_iqcorr.py b/gr-channels/python/channels/conj_fs_iqcorr.py index 700eb645c2..0b6371dd30 100644 --- a/gr-channels/python/channels/conj_fs_iqcorr.py +++ b/gr-channels/python/channels/conj_fs_iqcorr.py @@ -12,13 +12,14 @@ from gnuradio import filter from gnuradio import gr from gnuradio.filter import firdes + class conj_fs_iqcorr(gr.hier_block2): def __init__(self, delay=0, taps=[]): gr.hier_block2.__init__( self, "Conj FS IQBal", - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), ) ################################################## @@ -31,7 +32,7 @@ class conj_fs_iqcorr(gr.hier_block2): # Blocks ################################################## self.filter_fir_filter_xxx_0 = filter.fir_filter_ccc(1, (taps)) - self.delay_0 = blocks.delay(gr.sizeof_gr_complex*1, delay) + self.delay_0 = blocks.delay(gr.sizeof_gr_complex * 1, delay) self.blocks_conjugate_cc_0 = blocks.conjugate_cc() self.blocks_add_xx_0 = blocks.add_vcc(1) @@ -40,14 +41,13 @@ class conj_fs_iqcorr(gr.hier_block2): ################################################## self.connect((self.blocks_add_xx_0, 0), (self, 0)) self.connect((self, 0), (self.blocks_conjugate_cc_0, 0)) - self.connect((self.filter_fir_filter_xxx_0, 0), (self.blocks_add_xx_0, 1)) - self.connect((self.blocks_conjugate_cc_0, 0), (self.filter_fir_filter_xxx_0, 0)) + self.connect((self.filter_fir_filter_xxx_0, 0), + (self.blocks_add_xx_0, 1)) + self.connect((self.blocks_conjugate_cc_0, 0), + (self.filter_fir_filter_xxx_0, 0)) self.connect((self, 0), (self.delay_0, 0)) self.connect((self.delay_0, 0), (self.blocks_add_xx_0, 0)) - -# QT sink close method reimplementation - def get_delay(self): return self.delay @@ -61,5 +61,3 @@ class conj_fs_iqcorr(gr.hier_block2): def set_taps(self, taps): self.taps = taps self.filter_fir_filter_xxx_0.set_taps((self.taps)) - - diff --git a/gr-channels/python/channels/distortion_2_gen.py b/gr-channels/python/channels/distortion_2_gen.py index 28b5019686..20ab6fe563 100644 --- a/gr-channels/python/channels/distortion_2_gen.py +++ b/gr-channels/python/channels/distortion_2_gen.py @@ -11,13 +11,14 @@ from gnuradio import gr from gnuradio.filter import firdes import math + class distortion_2_gen(gr.hier_block2): def __init__(self, beta=0): gr.hier_block2.__init__( self, "Second Order Distortion", - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), ) ################################################## @@ -38,20 +39,22 @@ class distortion_2_gen(gr.hier_block2): ################################################## # Connections ################################################## - self.connect((self.blocks_multiply_const_vxx_0, 0), (self.blocks_add_xx_0, 1)) + self.connect((self.blocks_multiply_const_vxx_0, 0), + (self.blocks_add_xx_0, 1)) self.connect((self, 0), (self.blocks_multiply_xx_0, 0)) self.connect((self, 0), (self.blocks_add_xx_0, 0)) self.connect((self.blocks_add_xx_0, 0), (self, 0)) self.connect((self, 0), (self.blocks_conjugate_cc_0, 0)) - self.connect((self.blocks_conjugate_cc_0, 0), (self.blocks_multiply_xx_0_0, 1)) + self.connect((self.blocks_conjugate_cc_0, 0), + (self.blocks_multiply_xx_0_0, 1)) self.connect((self, 0), (self.blocks_multiply_xx_0, 1)) self.connect((self, 0), (self.blocks_multiply_xx_0_0, 0)) - self.connect((self.blocks_multiply_xx_0_0, 0), (self.blocks_add_xx_0_0, 1)) - self.connect((self.blocks_multiply_xx_0, 0), (self.blocks_add_xx_0_0, 0)) - self.connect((self.blocks_add_xx_0_0, 0), (self.blocks_multiply_const_vxx_0, 0)) - - -# QT sink close method reimplementation + self.connect((self.blocks_multiply_xx_0_0, 0), + (self.blocks_add_xx_0_0, 1)) + self.connect((self.blocks_multiply_xx_0, 0), + (self.blocks_add_xx_0_0, 0)) + self.connect((self.blocks_add_xx_0_0, 0), + (self.blocks_multiply_const_vxx_0, 0)) def get_beta(self): return self.beta diff --git a/gr-channels/python/channels/distortion_3_gen.py b/gr-channels/python/channels/distortion_3_gen.py index 1607e01bf2..eda558c3f5 100644 --- a/gr-channels/python/channels/distortion_3_gen.py +++ b/gr-channels/python/channels/distortion_3_gen.py @@ -11,13 +11,14 @@ from gnuradio import gr from gnuradio.filter import firdes import math + class distortion_3_gen(gr.hier_block2): def __init__(self, beta=0): gr.hier_block2.__init__( self, "Third Order Distortion", - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), ) ################################################## @@ -28,7 +29,7 @@ class distortion_3_gen(gr.hier_block2): ################################################## # Blocks ################################################## - self.blocks_null_source_0 = blocks.null_source(gr.sizeof_float*1) + self.blocks_null_source_0 = blocks.null_source(gr.sizeof_float * 1) self.blocks_multiply_xx_0 = blocks.multiply_vcc(1) self.blocks_multiply_const_vxx_0 = blocks.multiply_const_vcc((beta, )) self.blocks_float_to_complex_0 = blocks.float_to_complex(1) @@ -38,24 +39,24 @@ class distortion_3_gen(gr.hier_block2): ################################################## # Connections ################################################## - self.connect((self.blocks_float_to_complex_0, 0), (self.blocks_multiply_xx_0, 1)) - self.connect((self.blocks_null_source_0, 0), (self.blocks_float_to_complex_0, 1)) - self.connect((self.blocks_complex_to_mag_squared_0, 0), (self.blocks_float_to_complex_0, 0)) - self.connect((self.blocks_multiply_const_vxx_0, 0), (self.blocks_add_xx_0, 1)) - self.connect((self.blocks_multiply_xx_0, 0), (self.blocks_multiply_const_vxx_0, 0)) + self.connect((self.blocks_float_to_complex_0, 0), + (self.blocks_multiply_xx_0, 1)) + self.connect((self.blocks_null_source_0, 0), + (self.blocks_float_to_complex_0, 1)) + self.connect((self.blocks_complex_to_mag_squared_0, 0), + (self.blocks_float_to_complex_0, 0)) + self.connect((self.blocks_multiply_const_vxx_0, 0), + (self.blocks_add_xx_0, 1)) + self.connect((self.blocks_multiply_xx_0, 0), + (self.blocks_multiply_const_vxx_0, 0)) self.connect((self, 0), (self.blocks_complex_to_mag_squared_0, 0)) self.connect((self, 0), (self.blocks_multiply_xx_0, 0)) self.connect((self, 0), (self.blocks_add_xx_0, 0)) self.connect((self.blocks_add_xx_0, 0), (self, 0)) - -# QT sink close method reimplementation - def get_beta(self): return self.beta def set_beta(self, beta): self.beta = beta self.blocks_multiply_const_vxx_0.set_k((self.beta, )) - - diff --git a/gr-channels/python/channels/impairments.py b/gr-channels/python/channels/impairments.py index b81706bf97..e57b7522f9 100644 --- a/gr-channels/python/channels/impairments.py +++ b/gr-channels/python/channels/impairments.py @@ -12,12 +12,13 @@ from gnuradio import blocks from gnuradio import gr from gnuradio.filter import firdes -#Import locally +# Import locally from .phase_noise_gen import phase_noise_gen from .iqbal_gen import iqbal_gen from .distortion_2_gen import distortion_2_gen from .distortion_3_gen import distortion_3_gen + class impairments(gr.hier_block2): def __init__(self, @@ -31,8 +32,8 @@ class impairments(gr.hier_block2): beta=0): gr.hier_block2.__init__( self, "Radio Impairments Model", - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), ) ################################################## @@ -55,10 +56,11 @@ class impairments(gr.hier_block2): self.channels_distortion_3_gen_0 = distortion_3_gen(beta) self.channels_distortion_2_gen_0 = distortion_2_gen(gamma) self.freq_modulator = blocks.multiply_cc() - self.freq_offset_gen = analog.sig_source_c(1.0, analog.GR_COS_WAVE, freq_offset, 1, 0) + self.freq_offset_gen = analog.sig_source_c( + 1.0, analog.GR_COS_WAVE, freq_offset, 1, 0) self.freq_modulator_dcoffs = blocks.multiply_cc() self.freq_offset_conj = blocks.conjugate_cc() - self.dc_offset = blocks.add_const_vcc((i_ofs + q_ofs* 1j, )) + self.dc_offset = blocks.add_const_vcc((i_ofs + q_ofs * 1j, )) ################################################## # Frequency offset @@ -75,13 +77,11 @@ class impairments(gr.hier_block2): (self.dc_offset, 0), ) # Frequency offset again - self.connect((self.freq_offset_gen, 0), (self.freq_modulator_dcoffs, 0)) + self.connect((self.freq_offset_gen, 0), + (self.freq_modulator_dcoffs, 0)) self.connect((self.dc_offset, 0), (self.freq_modulator_dcoffs, 1)) self.connect((self.freq_modulator_dcoffs, 0), (self, 0)) - -# QT sink close method reimplementation - def get_phase_noise_mag(self): return self.phase_noise_mag @@ -108,7 +108,7 @@ class impairments(gr.hier_block2): def set_q_ofs(self, q_ofs): self.q_ofs = q_ofs - self.dc_offset.set_k((self.i_ofs + self.q_ofs* 1j, )) + self.dc_offset.set_k((self.i_ofs + self.q_ofs * 1j, )) def get_i_ofs(self): return self.i_ofs @@ -116,7 +116,7 @@ class impairments(gr.hier_block2): def set_i_ofs(self, i_ofs): """Set inphase part of DC offset""" self.i_ofs = i_ofs - self.dc_offset.set_k((self.i_ofs + self.q_ofs* 1j, )) + self.dc_offset.set_k((self.i_ofs + self.q_ofs * 1j, )) def get_freq_offset(self): """Return frequency offset (normalized to 1.0)""" diff --git a/gr-channels/python/channels/iqbal_gen.py b/gr-channels/python/channels/iqbal_gen.py index 42b8f64992..afc00ada84 100644 --- a/gr-channels/python/channels/iqbal_gen.py +++ b/gr-channels/python/channels/iqbal_gen.py @@ -11,6 +11,7 @@ from gnuradio import gr from gnuradio.filter import firdes import math + class iqbal_gen(gr.hier_block2): def __init__(self, magnitude=0, phase=0, mode=0): @@ -47,8 +48,8 @@ class iqbal_gen(gr.hier_block2): ''' gr.hier_block2.__init__( self, "IQ Imbalance Generator", - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), ) ################################################## @@ -62,9 +63,12 @@ class iqbal_gen(gr.hier_block2): # Blocks ################################################## # Same blocks for Transmitter and Receiver - self.mag = blocks.multiply_const_vff((math.pow(10,magnitude/20.0), )) - self.sin_phase = blocks.multiply_const_vff((math.sin(phase*math.pi/180.0), )) - self.cos_phase = blocks.multiply_const_vff((math.cos(phase*math.pi/180.0), )) + self.mag = blocks.multiply_const_vff( + (math.pow(10, magnitude / 20.0), )) + self.sin_phase = blocks.multiply_const_vff( + (math.sin(phase * math.pi / 180.0), )) + self.cos_phase = blocks.multiply_const_vff( + (math.cos(phase * math.pi / 180.0), )) self.f2c = blocks.float_to_complex(1) self.c2f = blocks.complex_to_float(1) self.adder = blocks.add_vff(1) @@ -95,7 +99,6 @@ class iqbal_gen(gr.hier_block2): self.connect((self.adder, 0), (self.f2c, 1)) self.connect((self.f2c, 0), (self, 0)) - # QT sink close method reimplementation def get_magnitude(self): @@ -103,14 +106,12 @@ class iqbal_gen(gr.hier_block2): def set_magnitude(self, magnitude): self.magnitude = magnitude - self.mag.set_k((math.pow(10,self.magnitude / 20.0), )) + self.mag.set_k((math.pow(10, self.magnitude / 20.0), )) def get_phase(self): return self.phase def set_phase(self, phase): self.phase = phase - self.sin_phase.set_k((math.sin(self.phase*math.pi/180.0), )) - self.cos_phase.set_k((math.cos(self.phase*math.pi/180.0), )) - - + self.sin_phase.set_k((math.sin(self.phase * math.pi / 180.0), )) + self.cos_phase.set_k((math.cos(self.phase * math.pi / 180.0), )) diff --git a/gr-channels/python/channels/phase_bal.py b/gr-channels/python/channels/phase_bal.py index b760e6f439..4bece67fa9 100644 --- a/gr-channels/python/channels/phase_bal.py +++ b/gr-channels/python/channels/phase_bal.py @@ -11,13 +11,14 @@ from gnuradio import filter from gnuradio import gr from gnuradio.filter import firdes + class phase_bal(gr.hier_block2): def __init__(self, alpha=0): gr.hier_block2.__init__( self, "IQ Phase Balancer", - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), ) ################################################## @@ -28,7 +29,8 @@ class phase_bal(gr.hier_block2): ################################################## # Blocks ################################################## - self.filter_single_pole_iir_filter_xx_0 = filter.single_pole_iir_filter_ff(alpha, 1) + self.filter_single_pole_iir_filter_xx_0 = filter.single_pole_iir_filter_ff( + alpha, 1) self.blocks_sub_xx_1 = blocks.sub_ff(1) self.blocks_sub_xx_0 = blocks.sub_ff(1) self.blocks_multiply_xx_2 = blocks.multiply_vff(1) @@ -43,28 +45,39 @@ class phase_bal(gr.hier_block2): ################################################## # Connections ################################################## - self.connect((self.blocks_complex_to_float_0, 0), (self.blocks_multiply_xx_0, 0)) - self.connect((self.blocks_complex_to_float_0, 1), (self.blocks_multiply_xx_0, 1)) - self.connect((self.blocks_multiply_xx_0, 0), (self.blocks_divide_xx_0, 0)) - self.connect((self.blocks_sub_xx_0, 0), (self.blocks_float_to_complex_0, 1)) + self.connect((self.blocks_complex_to_float_0, 0), + (self.blocks_multiply_xx_0, 0)) + self.connect((self.blocks_complex_to_float_0, 1), + (self.blocks_multiply_xx_0, 1)) + self.connect((self.blocks_multiply_xx_0, 0), + (self.blocks_divide_xx_0, 0)) + self.connect((self.blocks_sub_xx_0, 0), + (self.blocks_float_to_complex_0, 1)) self.connect((self.blocks_multiply_xx_1, 0), (self.blocks_sub_xx_0, 1)) - self.connect((self.filter_single_pole_iir_filter_xx_0, 0), (self.blocks_multiply_xx_1, 1)) - self.connect((self.blocks_complex_to_float_0, 0), (self.blocks_multiply_xx_1, 0)) + self.connect((self.filter_single_pole_iir_filter_xx_0, 0), + (self.blocks_multiply_xx_1, 1)) + self.connect((self.blocks_complex_to_float_0, 0), + (self.blocks_multiply_xx_1, 0)) self.connect((self.blocks_multiply_xx_2, 0), (self.blocks_sub_xx_1, 1)) - self.connect((self.blocks_complex_to_float_0, 1), (self.blocks_sub_xx_0, 0)) - self.connect((self.blocks_sub_xx_1, 0), (self.blocks_float_to_complex_0, 0)) - self.connect((self.blocks_complex_to_mag_squared_0, 0), (self.blocks_divide_xx_0, 1)) - self.connect((self.blocks_complex_to_float_0, 0), (self.blocks_sub_xx_1, 0)) - self.connect((self.blocks_divide_xx_0, 0), (self.blocks_multiply_const_vxx_0, 0)) - self.connect((self.blocks_multiply_const_vxx_0, 0), (self.filter_single_pole_iir_filter_xx_0, 0)) + self.connect((self.blocks_complex_to_float_0, 1), + (self.blocks_sub_xx_0, 0)) + self.connect((self.blocks_sub_xx_1, 0), + (self.blocks_float_to_complex_0, 0)) + self.connect((self.blocks_complex_to_mag_squared_0, 0), + (self.blocks_divide_xx_0, 1)) + self.connect((self.blocks_complex_to_float_0, 0), + (self.blocks_sub_xx_1, 0)) + self.connect((self.blocks_divide_xx_0, 0), + (self.blocks_multiply_const_vxx_0, 0)) + self.connect((self.blocks_multiply_const_vxx_0, 0), + (self.filter_single_pole_iir_filter_xx_0, 0)) self.connect((self, 0), (self.blocks_complex_to_float_0, 0)) self.connect((self, 0), (self.blocks_complex_to_mag_squared_0, 0)) self.connect((self.blocks_float_to_complex_0, 0), (self, 0)) - self.connect((self.filter_single_pole_iir_filter_xx_0, 0), (self.blocks_multiply_xx_2, 0)) - self.connect((self.blocks_complex_to_float_0, 1), (self.blocks_multiply_xx_2, 1)) - - -# QT sink close method reimplementation + self.connect((self.filter_single_pole_iir_filter_xx_0, 0), + (self.blocks_multiply_xx_2, 0)) + self.connect((self.blocks_complex_to_float_0, 1), + (self.blocks_multiply_xx_2, 1)) def get_alpha(self): return self.alpha @@ -72,5 +85,3 @@ class phase_bal(gr.hier_block2): def set_alpha(self, alpha): self.alpha = alpha self.filter_single_pole_iir_filter_xx_0.set_taps(self.alpha) - - diff --git a/gr-channels/python/channels/phase_noise_gen.py b/gr-channels/python/channels/phase_noise_gen.py index 95c5676e40..4c4f39c860 100644 --- a/gr-channels/python/channels/phase_noise_gen.py +++ b/gr-channels/python/channels/phase_noise_gen.py @@ -12,13 +12,14 @@ from gnuradio import filter from gnuradio import gr from gnuradio.filter import firdes + class phase_noise_gen(gr.hier_block2): def __init__(self, noise_mag=0, alpha=0.1): gr.hier_block2.__init__( self, "Phase Noise Generator", - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), - gr.io_signature(1, 1, gr.sizeof_gr_complex*1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), + gr.io_signature(1, 1, gr.sizeof_gr_complex * 1), ) ################################################## @@ -30,27 +31,32 @@ class phase_noise_gen(gr.hier_block2): ################################################## # Blocks ################################################## - self.filter_single_pole_iir_filter_xx_0 = filter.single_pole_iir_filter_ff(alpha, 1) + self.filter_single_pole_iir_filter_xx_0 = filter.single_pole_iir_filter_ff( + alpha, 1) self.blocks_transcendental_0_0 = blocks.transcendental("sin", "float") self.blocks_transcendental_0 = blocks.transcendental("cos", "float") self.blocks_multiply_xx_0 = blocks.multiply_vcc(1) self.blocks_float_to_complex_0 = blocks.float_to_complex(1) - self.analog_noise_source_x_0 = analog.noise_source_f(analog.GR_GAUSSIAN, noise_mag, 42) + self.analog_noise_source_x_0 = analog.noise_source_f( + analog.GR_GAUSSIAN, noise_mag, 42) ################################################## # Connections ################################################## - self.connect((self.blocks_float_to_complex_0, 0), (self.blocks_multiply_xx_0, 1)) - self.connect((self.analog_noise_source_x_0, 0), (self.filter_single_pole_iir_filter_xx_0, 0)) + self.connect((self.blocks_float_to_complex_0, 0), + (self.blocks_multiply_xx_0, 1)) + self.connect((self.analog_noise_source_x_0, 0), + (self.filter_single_pole_iir_filter_xx_0, 0)) self.connect((self.blocks_multiply_xx_0, 0), (self, 0)) self.connect((self, 0), (self.blocks_multiply_xx_0, 0)) - self.connect((self.filter_single_pole_iir_filter_xx_0, 0), (self.blocks_transcendental_0, 0)) - self.connect((self.filter_single_pole_iir_filter_xx_0, 0), (self.blocks_transcendental_0_0, 0)) - self.connect((self.blocks_transcendental_0, 0), (self.blocks_float_to_complex_0, 0)) - self.connect((self.blocks_transcendental_0_0, 0), (self.blocks_float_to_complex_0, 1)) - - -# QT sink close method reimplementation + self.connect((self.filter_single_pole_iir_filter_xx_0, 0), + (self.blocks_transcendental_0, 0)) + self.connect((self.filter_single_pole_iir_filter_xx_0, 0), + (self.blocks_transcendental_0_0, 0)) + self.connect((self.blocks_transcendental_0, 0), + (self.blocks_float_to_complex_0, 0)) + self.connect((self.blocks_transcendental_0_0, 0), + (self.blocks_float_to_complex_0, 1)) def get_noise_mag(self): return self.noise_mag @@ -65,5 +71,3 @@ class phase_noise_gen(gr.hier_block2): def set_alpha(self, alpha): self.alpha = alpha self.filter_single_pole_iir_filter_xx_0.set_taps(self.alpha) - - diff --git a/gr-channels/python/channels/quantizer.py b/gr-channels/python/channels/quantizer.py index cedeb368d0..ef009845b6 100644 --- a/gr-channels/python/channels/quantizer.py +++ b/gr-channels/python/channels/quantizer.py @@ -9,13 +9,14 @@ from gnuradio import blocks from gnuradio import gr from gnuradio.filter import firdes + class quantizer(gr.hier_block2): def __init__(self, bits=16): gr.hier_block2.__init__( self, "Quantizer", - gr.io_signature(1, 1, gr.sizeof_float*1), - gr.io_signature(1, 1, gr.sizeof_float*1), + gr.io_signature(1, 1, gr.sizeof_float * 1), + gr.io_signature(1, 1, gr.sizeof_float * 1), ) ################################################## @@ -27,28 +28,29 @@ class quantizer(gr.hier_block2): # Blocks ################################################## self.blocks_short_to_float_0 = blocks.short_to_float(1, 1) - self.blocks_multiply_const_vxx_0_0 = blocks.multiply_const_vff((1.0 / pow(2.0,bits-1.0), )) - self.blocks_multiply_const_vxx_0 = blocks.multiply_const_vff((pow(2,bits-1.0), )) + self.blocks_multiply_const_vxx_0_0 = blocks.multiply_const_vff( + (1.0 / pow(2.0, bits - 1.0), )) + self.blocks_multiply_const_vxx_0 = blocks.multiply_const_vff( + (pow(2, bits - 1.0), )) self.blocks_float_to_short_0 = blocks.float_to_short(1, 1) ################################################## # Connections ################################################## self.connect((self.blocks_multiply_const_vxx_0_0, 0), (self, 0)) - self.connect((self.blocks_short_to_float_0, 0), (self.blocks_multiply_const_vxx_0_0, 0)) - self.connect((self.blocks_float_to_short_0, 0), (self.blocks_short_to_float_0, 0)) - self.connect((self.blocks_multiply_const_vxx_0, 0), (self.blocks_float_to_short_0, 0)) + self.connect((self.blocks_short_to_float_0, 0), + (self.blocks_multiply_const_vxx_0_0, 0)) + self.connect((self.blocks_float_to_short_0, 0), + (self.blocks_short_to_float_0, 0)) + self.connect((self.blocks_multiply_const_vxx_0, 0), + (self.blocks_float_to_short_0, 0)) self.connect((self, 0), (self.blocks_multiply_const_vxx_0, 0)) - -# QT sink close method reimplementation - def get_bits(self): return self.bits def set_bits(self, bits): self.bits = bits - self.blocks_multiply_const_vxx_0_0.set_k((1.0 / pow(2.0,self.bits-1.0), )) - self.blocks_multiply_const_vxx_0.set_k((pow(2,self.bits-1.0), )) - - + self.blocks_multiply_const_vxx_0_0.set_k( + (1.0 / pow(2.0, self.bits - 1.0), )) + self.blocks_multiply_const_vxx_0.set_k((pow(2, self.bits - 1.0), )) |