From 598924aa8be0740583d9d32f99269e1e55134b6e Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 26 Feb 2010 10:11:39 -0500
Subject: Fixing a few bugs in handling of real samples per symbol.
---
gnuradio-examples/python/digital/pick_bitrate2.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'gnuradio-examples/python/digital/pick_bitrate2.py')
diff --git a/gnuradio-examples/python/digital/pick_bitrate2.py b/gnuradio-examples/python/digital/pick_bitrate2.py
index 23081117c9..92539560c3 100644
--- a/gnuradio-examples/python/digital/pick_bitrate2.py
+++ b/gnuradio-examples/python/digital/pick_bitrate2.py
@@ -68,8 +68,7 @@ def _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
try:
xrate = rate
except UnboundLocalError:
- print "Requested bitrate out of bounds"
- sys.exit(1)
+ raise ValueError("Requested bitrate out of bounds")
samples_per_symbol = converter_rate / bits_per_symbol / rate / bitrate
bitrate = converter_rate / bits_per_symbol / xrate / samples_per_symbol
@@ -100,7 +99,7 @@ def _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
raise ValueError(("Invalid rate (rate = %d)" % xrate))
if((samples_per_symbol < _sps_min) or (samples_per_symbol > _sps_max)):
raise ValueError(("Invalid samples per symbol (sps = %.2f). Must be in [%.0f, %.0f]." \
- % (xrate, _sps_min, _sps_max)))
+ % (samples_per_symbol, _sps_min, _sps_max)))
return (bitrate, samples_per_symbol, int(xrate))
--
cgit v1.2.3