From b41f7f77cb3a59b54e4511be5069edbbfc27c2ad Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Tue, 19 Jun 2012 21:10:23 -0400
Subject: filter: removed all references to filter functions from gr namespace
to filter.
---
gr-filter/python/qa_fractional_interpolator.py | 4 ++--
gr-filter/python/qa_interp_fir_filter.py | 2 +-
gr-filter/python/qa_pfb_arb_resampler.py | 12 ++++++------
gr-filter/python/qa_pfb_channelizer.py | 6 +++---
gr-filter/python/qa_pfb_decimator.py | 10 +++++-----
gr-filter/python/qa_pfb_interpolator.py | 6 +++---
gr-filter/python/qa_pfb_synthesizer.py | 6 +++---
gr-filter/python/qa_pm_remez.py | 2 +-
gr-filter/python/rational_resampler.py | 20 +++++++++-----------
9 files changed, 33 insertions(+), 35 deletions(-)
(limited to 'gr-filter/python')
diff --git a/gr-filter/python/qa_fractional_interpolator.py b/gr-filter/python/qa_fractional_interpolator.py
index 51c8f95304..74dae5d852 100755
--- a/gr-filter/python/qa_fractional_interpolator.py
+++ b/gr-filter/python/qa_fractional_interpolator.py
@@ -32,8 +32,8 @@ class test_fractional_resampler(gr_unittest.TestCase):
self.tb = None
def test_000_make(self):
- op = gr.fractional_interpolator_ff(0.0, 1.0)
- op2 = gr.fractional_interpolator_cc(0.0, 1.0)
+ op = filter.fractional_interpolator_ff(0.0, 1.0)
+ op2 = filter.fractional_interpolator_cc(0.0, 1.0)
if __name__ == '__main__':
gr_unittest.run(test_fractional_resampler, "test_fractional_resampler.xml")
diff --git a/gr-filter/python/qa_interp_fir_filter.py b/gr-filter/python/qa_interp_fir_filter.py
index 97901963ea..839330539b 100755
--- a/gr-filter/python/qa_interp_fir_filter.py
+++ b/gr-filter/python/qa_interp_fir_filter.py
@@ -46,7 +46,7 @@ class test_interp_fir_filter(gr_unittest.TestCase):
expected_result = tuple([float(x) for x in xr])
src = gr.vector_source_f(src_data)
- op = gr.interp_fir_filter_fff(interpolation, taps)
+ op = filter.interp_fir_filter_fff(interpolation, taps)
dst = gr.vector_sink_f()
self.tb.connect(src, op)
self.tb.connect(op, dst)
diff --git a/gr-filter/python/qa_pfb_arb_resampler.py b/gr-filter/python/qa_pfb_arb_resampler.py
index 655b680f05..a4e22f4c02 100755
--- a/gr-filter/python/qa_pfb_arb_resampler.py
+++ b/gr-filter/python/qa_pfb_arb_resampler.py
@@ -38,9 +38,9 @@ class test_pfb_arb_resampler(gr_unittest.TestCase):
rrate = 1.123 # resampling rate
nfilts = 32
- taps = gr.firdes.low_pass_2(nfilts, nfilts*fs, fs/2, fs/10,
- attenuation_dB=80,
- window=gr.firdes.WIN_BLACKMAN_hARRIS)
+ taps = filter.firdes.low_pass_2(nfilts, nfilts*fs, fs/2, fs/10,
+ attenuation_dB=80,
+ window=filter.firdes.WIN_BLACKMAN_hARRIS)
freq = 100
signal = gr.sig_source_f(fs, gr.GR_SIN_WAVE, freq, 1)
@@ -67,9 +67,9 @@ class test_pfb_arb_resampler(gr_unittest.TestCase):
rrate = 1.123 # resampling rate
nfilts = 32
- taps = gr.firdes.low_pass_2(nfilts, nfilts*fs, fs/2, fs/10,
- attenuation_dB=80,
- window=gr.firdes.WIN_BLACKMAN_hARRIS)
+ taps = filter.firdes.low_pass_2(nfilts, nfilts*fs, fs/2, fs/10,
+ attenuation_dB=80,
+ window=filter.firdes.WIN_BLACKMAN_hARRIS)
freq = 100
signal = gr.sig_source_c(fs, gr.GR_SIN_WAVE, freq, 1)
diff --git a/gr-filter/python/qa_pfb_channelizer.py b/gr-filter/python/qa_pfb_channelizer.py
index b52c80e8bd..33d2b2188c 100755
--- a/gr-filter/python/qa_pfb_channelizer.py
+++ b/gr-filter/python/qa_pfb_channelizer.py
@@ -38,9 +38,9 @@ class test_pfb_channelizer(gr_unittest.TestCase):
fs = 1000 # baseband sampling rate
ifs = M*fs # input samp rate to channelizer
- taps = gr.firdes.low_pass_2(1, ifs, 500, 50,
- attenuation_dB=80,
- window=gr.firdes.WIN_BLACKMAN_hARRIS)
+ taps = filter.firdes.low_pass_2(1, ifs, 500, 50,
+ attenuation_dB=80,
+ window=filter.firdes.WIN_BLACKMAN_hARRIS)
signals = list()
add = gr.add_cc()
diff --git a/gr-filter/python/qa_pfb_decimator.py b/gr-filter/python/qa_pfb_decimator.py
index c8fd408be6..063845f638 100755
--- a/gr-filter/python/qa_pfb_decimator.py
+++ b/gr-filter/python/qa_pfb_decimator.py
@@ -39,9 +39,9 @@ class test_pfb_decimator(gr_unittest.TestCase):
ifs = M*fs # input samp rate to decimator
channel = 0 # Extract channel 0
- taps = gr.firdes.low_pass_2(1, ifs, fs/2, fs/10,
- attenuation_dB=80,
- window=gr.firdes.WIN_BLACKMAN_hARRIS)
+ taps = filter.firdes.low_pass_2(1, ifs, fs/2, fs/10,
+ attenuation_dB=80,
+ window=filter.firdes.WIN_BLACKMAN_hARRIS)
signals = list()
add = gr.add_cc()
@@ -84,9 +84,9 @@ class test_pfb_decimator(gr_unittest.TestCase):
ifs = M*fs # input samp rate to decimator
channel = 1 # Extract channel 0
- taps = gr.firdes.low_pass_2(1, ifs, fs/2, fs/10,
+ taps = filter.firdes.low_pass_2(1, ifs, fs/2, fs/10,
attenuation_dB=80,
- window=gr.firdes.WIN_BLACKMAN_hARRIS)
+ window=filter.firdes.WIN_BLACKMAN_hARRIS)
signals = list()
add = gr.add_cc()
diff --git a/gr-filter/python/qa_pfb_interpolator.py b/gr-filter/python/qa_pfb_interpolator.py
index f83c57d603..5b84b7c642 100755
--- a/gr-filter/python/qa_pfb_interpolator.py
+++ b/gr-filter/python/qa_pfb_interpolator.py
@@ -38,9 +38,9 @@ class test_pfb_interpolator(gr_unittest.TestCase):
fs = 1000 # baseband sampling rate
ifs = M*fs # input samp rate to decimator
- taps = gr.firdes.low_pass_2(M, ifs, fs/2, fs/10,
- attenuation_dB=80,
- window=gr.firdes.WIN_BLACKMAN_hARRIS)
+ taps = filter.firdes.low_pass_2(M, ifs, fs/2, fs/10,
+ attenuation_dB=80,
+ window=filter.firdes.WIN_BLACKMAN_hARRIS)
freq = 100
signal = gr.sig_source_c(fs, gr.GR_COS_WAVE, freq, 1)
diff --git a/gr-filter/python/qa_pfb_synthesizer.py b/gr-filter/python/qa_pfb_synthesizer.py
index 8b69ccb12f..e8164d2683 100755
--- a/gr-filter/python/qa_pfb_synthesizer.py
+++ b/gr-filter/python/qa_pfb_synthesizer.py
@@ -38,9 +38,9 @@ class test_pfb_synthesizer(gr_unittest.TestCase):
fs = 1000 # baseband sampling rate
ofs = M*fs # input samp rate to decimator
- taps = gr.firdes.low_pass_2(M, ofs, fs/2, fs/10,
- attenuation_dB=80,
- window=gr.firdes.WIN_BLACKMAN_hARRIS)
+ taps = filter.firdes.low_pass_2(M, ofs, fs/2, fs/10,
+ attenuation_dB=80,
+ window=filter.firdes.WIN_BLACKMAN_hARRIS)
signals = list()
freqs = [0, 100, 200, -200, -100]
diff --git a/gr-filter/python/qa_pm_remez.py b/gr-filter/python/qa_pm_remez.py
index 765e2ea6aa..a76e14c938 100755
--- a/gr-filter/python/qa_pm_remez.py
+++ b/gr-filter/python/qa_pm_remez.py
@@ -159,7 +159,7 @@ class test_pm_remez(gr_unittest.TestCase):
desired_ampls = (gain, 0)
(n, fo, ao, w) = remezord([freq1, freq2], desired_ampls,
[passband_dev, stopband_dev], Fs)
- new_taps = gr.remez(n + 2, fo, ao, w, "bandpass")
+ new_taps = filter.pm_remez(n + 2, fo, ao, w, "bandpass")
known_taps = (-0.0008370135734511828, -0.0006622211673134374,
0.0008501079576365787, 0.003059609130249229,
diff --git a/gr-filter/python/rational_resampler.py b/gr-filter/python/rational_resampler.py
index eea12af958..312b011d32 100644
--- a/gr-filter/python/rational_resampler.py
+++ b/gr-filter/python/rational_resampler.py
@@ -44,14 +44,12 @@ def design_filter(interpolation, decimation, fractional_bw):
trans_width = 0.5 - fractional_bw
mid_transition_band = 0.5 - trans_width/2
- taps = gr.firdes.low_pass(interpolation, # gain
- 1, # Fs
- mid_transition_band/interpolation, # trans mid point
- trans_width/interpolation, # transition width
- gr.firdes.WIN_KAISER,
- beta # beta
- )
-
+ taps = filter.firdes.low_pass(interpolation, # gain
+ 1, # Fs
+ mid_transition_band/interpolation, # trans mid point
+ trans_width/interpolation, # transition width
+ filter.firdes.WIN_KAISER,
+ beta) # beta
return taps
@@ -109,7 +107,7 @@ class rational_resampler_fff(_rational_resampler_base):
Rational resampling polyphase FIR filter with
float input, float output and float taps.
"""
- _rational_resampler_base.__init__(self, gr.rational_resampler_base_fff,
+ _rational_resampler_base.__init__(self, filter.rational_resampler_base_fff,
interpolation, decimation, taps, fractional_bw)
class rational_resampler_ccf(_rational_resampler_base):
@@ -118,7 +116,7 @@ class rational_resampler_ccf(_rational_resampler_base):
Rational resampling polyphase FIR filter with
complex input, complex output and float taps.
"""
- _rational_resampler_base.__init__(self, gr.rational_resampler_base_ccf,
+ _rational_resampler_base.__init__(self, filter.rational_resampler_base_ccf,
interpolation, decimation, taps, fractional_bw)
class rational_resampler_ccc(_rational_resampler_base):
@@ -127,5 +125,5 @@ class rational_resampler_ccc(_rational_resampler_base):
Rational resampling polyphase FIR filter with
complex input, complex output and complex taps.
"""
- _rational_resampler_base.__init__(self, gr.rational_resampler_base_ccc,
+ _rational_resampler_base.__init__(self, filter.rational_resampler_base_ccc,
interpolation, decimation, taps, fractional_bw)
--
cgit v1.2.3