summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/python
diff options
context:
space:
mode:
authorTom Rondeau2010-02-26 10:11:39 -0500
committerTom Rondeau2010-02-26 10:11:39 -0500
commit598924aa8be0740583d9d32f99269e1e55134b6e (patch)
tree84a36302acb42c0c1b0e4ca9067f524b5f03688f /gnuradio-core/src/python
parent93c51f5c02311f89dc6eb47923b34b13038c805c (diff)
downloadgnuradio-598924aa8be0740583d9d32f99269e1e55134b6e.tar.gz
gnuradio-598924aa8be0740583d9d32f99269e1e55134b6e.tar.bz2
gnuradio-598924aa8be0740583d9d32f99269e1e55134b6e.zip
Fixing a few bugs in handling of real samples per symbol.
Diffstat (limited to 'gnuradio-core/src/python')
-rw-r--r--gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py
index 9fae6acca..96cf0144f 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py
@@ -83,8 +83,8 @@ class dqpsk2_mod(gr.hier_block2):
self._excess_bw = excess_bw
self._gray_code = gray_code
- if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
- raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
+ if samples_per_symbol < 2:
+ raise TypeError, ("sbp must be >= 2, is %f" % samples_per_symbol)
ntaps = 11 * samples_per_symbol
@@ -107,7 +107,7 @@ class dqpsk2_mod(gr.hier_block2):
# pulse shaping filter
nfilts = 32
- ntaps = nfilts * 11 * self._samples_per_symbol # make nfilts filters of ntaps each
+ ntaps = 11 * int(nfilts * self._samples_per_symbol) # make nfilts filters of ntaps each
self.rrc_taps = gr.firdes.root_raised_cosine(
nfilts, # gain
nfilts, # sampling rate based on 32 filters in resampler