diff options
| author | jcorgan | 2007-05-28 17:04:09 +0000 |
|---|---|---|
| committer | jcorgan | 2007-05-28 17:04:09 +0000 |
| commit | 9880e7bb383054aa43681b52ebd33c8fd4cb8fcb (patch) | |
| tree | c9cd097baefda9ec392da2944fb799cbffabaa40 /gnuradio-examples/python/hier/dect/gmsk2.py | |
| parent | f29776e2c39c06c958e7b4dfeae8883b47305969 (diff) | |
| download | gnuradio-9880e7bb383054aa43681b52ebd33c8fd4cb8fcb.tar.gz gnuradio-9880e7bb383054aa43681b52ebd33c8fd4cb8fcb.tar.bz2 gnuradio-9880e7bb383054aa43681b52ebd33c8fd4cb8fcb.zip | |
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
Diffstat (limited to 'gnuradio-examples/python/hier/dect/gmsk2.py')
| -rw-r--r-- | gnuradio-examples/python/hier/dect/gmsk2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-examples/python/hier/dect/gmsk2.py b/gnuradio-examples/python/hier/dect/gmsk2.py index f7107241f..32569b4d0 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 |