Fixing a few bugs in handling of real samples per symbol.

[debian/gnuradio] / 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 23081117c9ee8809f54819d570b3eb4be88cd7e9..92539560c3427515c96588537d5436d88f66f28c 100644 (file)
--- 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))