From 9880e7bb383054aa43681b52ebd33c8fd4cb8fcb Mon Sep 17 00:00:00 2001 From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> Date: Mon, 28 May 2007 17:04:09 +0000 Subject: Merged r5547:5542 from jcorgan/num into trunk. Converts from using Python Numeric to numpy. Trunk passes distcheck. gr-radio-astronomy still needs conversion. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5553 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-examples/python/hier/dect/gmsk2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-examples/python/hier/dect/gmsk2.py') diff --git a/gnuradio-examples/python/hier/dect/gmsk2.py b/gnuradio-examples/python/hier/dect/gmsk2.py index f7107241f2..32569b4d07 100644 --- a/gnuradio-examples/python/hier/dect/gmsk2.py +++ b/gnuradio-examples/python/hier/dect/gmsk2.py @@ -27,7 +27,7 @@ from gnuradio import gr from gnuradio import modulation_utils from math import pi -import Numeric +import numpy from pprint import pprint import inspect @@ -97,7 +97,7 @@ class gmsk2_mod(gr.hier_block2): ) self.sqwave = (1,) * samples_per_symbol # rectangular window - self.taps = Numeric.convolve(Numeric.array(self.gaussian_taps),Numeric.array(self.sqwave)) + self.taps = numpy.convolve(numpy.array(self.gaussian_taps),numpy.array(self.sqwave)) self.gaussian_filter = gr.interp_fir_filter_fff(samples_per_symbol, self.taps) # FM modulation -- cgit v1.2.3