[Commit-gnuradio] r3624 - gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl

[eb]

Author: eb
Date: 2006-09-22 15:46:44 -0600 (Fri, 22 Sep 2006)
New Revision: 3624

Modified:
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
Log:
refactored default argument handling

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
     2006-09-22 20:33:17 UTC (rev 3623)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
     2006-09-22 21:46:44 UTC (rev 3624)
@@ -38,8 +38,20 @@
 # /////////////////////////////////////////////////////////////////////////////
 
 class dbpsk_mod(gr.hier_block):
-    def __init__(self, fg, samples_per_symbol=2, excess_bw=0.35,
-                 gray_code=True, verbose=True, log=False):
+
+    # default values (used in __init__ and add_options)
+    _def_samples_per_symbol = 2
+    _def_excess_bw = 0.35
+    _def_gray_code = True
+    _def_verbose = False
+    _def_log = False
+
+    def __init__(self, fg,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 excess_bw=_def_excess_bw,
+                 gray_code=_def_gray_code,
+                 verbose=_def_verbose,
+                 log=_def_log):
         """
        Hierarchical block for RRC-filtered differential BPSK modulation.
 
@@ -121,7 +133,7 @@
         """
         Adds DBPSK modulation-specific options to the standard parser
         """
-        parser.add_option("", "--excess-bw", type="float", default=0.35,
+        parser.add_option("", "--excess-bw", type="float", 
default=_def_excess_bw,
                           help="set RRC excess bandwith factor 
[default=%default]")
         parser.add_option("", "--no-gray-code", dest="gray_code",
                           action="store_false", default=True,
@@ -163,9 +175,28 @@
 # /////////////////////////////////////////////////////////////////////////////
 
 class dbpsk_demod(gr.hier_block):
-    def __init__(self, fg, samples_per_symbol, excess_bw=0.35, 
costas_alpha=0.05,
-                 gain_mu=0.03, mu=0.05, omega_relative_limit=0.005,
-                 gray_code=True, verbose=True, log=False):
+
+    # default values (used in __init__ and add_options)
+    _def_samples_per_symbol = 2
+    _def_excess_bw = 0.35
+    _def_costas_alpha = 0.05
+    _def_gain_mu = 0.03
+    _def_mu = 0.05
+    _def_omega_relative_limit = 0.005
+    _def_gray_code = True
+    _def_verbose = False
+    _def_log = False
+
+    def __init__(self, fg,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 excess_bw=_def_excess_bw,
+                 costas_alpha=_def_costas_alpha,
+                 gain_mu=_def_gain_mu,
+                 mu=_def_mu,
+                 omega_relative_limit=_def_omega_relative_limit,
+                 gray_code=_def_gray_code,
+                 verbose=_def_verbose,
+                 log=_def_log):
         """
        Hierarchical block for RRC-filtered differential BPSK demodulation
 
@@ -240,7 +271,7 @@
         # find closest constellation point
         rot = 1
         rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        print "rotated_const =", rotated_const
+        #print "rotated_const =", rotated_const
 
         self.diffdec = gr.diff_phasor_cc()
         #self.diffdec = gr.diff_decoder_bb(arity)
@@ -307,18 +338,18 @@
         """
         Adds DBPSK demodulation-specific options to the standard parser
         """
-        parser.add_option("", "--excess-bw", type="float", default=0.35,
+        parser.add_option("", "--excess-bw", type="float", 
default=_def_excess_bw,
                           help="set RRC excess bandwith factor 
[default=%default] (PSK)")
         parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=True,
+                          action="store_false", default=_def_gray_code,
                           help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", default=0.05,
+        parser.add_option("", "--costas-alpha", type="float", 
default=_def_costas_alpha,
                           help="set Costas loop alpha value [default=%default] 
(PSK)")
-        parser.add_option("", "--gain-mu", type="float", default=0.05,
+        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
                           help="set M&M symbol sync loop gain mu value 
[default=%default] (GMSK/PSK)")
-        parser.add_option("", "--mu", type="float", default=0.5,
+        parser.add_option("", "--mu", type="float", default=_def_mu,
                           help="set M&M symbol sync loop mu value 
[default=%default] (GMSK/PSK)")
-        parser.add_option("", "--omega-relative-limit", type="float", 
default=0.005,
+        parser.add_option("", "--omega-relative-limit", type="float", 
default=_def_omega_relative_limit,
                           help="M&M clock recovery omega relative limit 
[default=%default] (GMSK/PSK)")
     add_options=staticmethod(add_options)
     

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
     2006-09-22 20:33:17 UTC (rev 3623)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
     2006-09-22 21:46:44 UTC (rev 3624)
@@ -38,8 +38,19 @@
 
 class dqpsk_mod(gr.hier_block):
 
-    def __init__(self, fg, samples_per_symbol=2, excess_bw=0.35,
-                 gray_code=True, verbose=True, log=False):
+    # default values (used in __init__ and add_options)
+    _def_samples_per_symbol = 2
+    _def_excess_bw = 0.35
+    _def_gray_code = True
+    _def_verbose = False
+    _def_log = False
+    
+    def __init__(self, fg,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 excess_bw=_def_excess_bw,
+                 gray_code=_def_gray_code,
+                 verbose=_def_verbose,
+                 log=_def_log):
         """
        Hierarchical block for RRC-filtered QPSK modulation.
 
@@ -137,10 +148,10 @@
         """
         Adds QPSK modulation-specific options to the standard parser
         """
-        parser.add_option("", "--excess-bw", type="float", default=0.35,
+        parser.add_option("", "--excess-bw", type="float", 
default=_def_excess_bw,
                           help="set RRC excess bandwith factor 
[default=%default] (PSK)")
         parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=True,
+                          action="store_false", default=_def_gray_code,
                           help="disable gray coding on modulated bits (PSK)")
     add_options=staticmethod(add_options)
 
@@ -161,9 +172,28 @@
 # /////////////////////////////////////////////////////////////////////////////
 
 class dqpsk_demod(gr.hier_block):
-    def __init__(self, fg, samples_per_symbol, excess_bw=0.35, 
costas_alpha=0.05,
-                 gain_mu=0.03, mu=0.05, omega_relative_limit=0.005,
-                 gray_code=True, verbose=True, log=False):
+
+    # default values (used in __init__ and add_options)
+    _def_samples_per_symbol = 2
+    _def_excess_bw = 0.35
+    _def_costas_alpha = 0.05
+    _def_gain_mu = 0.03
+    _def_mu = 0.05
+    _def_omega_relative_limit = 0.005
+    _def_gray_code = True
+    _def_verbose = False
+    _def_log = False
+    
+    def __init__(self, fg,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 excess_bw=_def_excess_bw,
+                 costas_alpha=_def_costas_alpha,
+                 gain_mu=_def_gain_mu,
+                 mu=_def_mu,
+                 omega_relative_limit=_def_omega_relative_limit,
+                 gray_code=_def_gray_code,
+                 verbose=_def_verbose,
+                 log=_def_log):
         """
        Hierarchical block for RRC-filtered DQPSK demodulation
 
@@ -242,7 +272,7 @@
         rot = 1
         #rot = .707 + .707j
         rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        print "rotated_const = %s" % rotated_const
+        #print "rotated_const = %s" % rotated_const
 
         self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
 
@@ -307,16 +337,16 @@
         """
         Adds modulation-specific options to the standard parser
         """
-        parser.add_option("", "--excess-bw", type="float", default=0.35,
+        parser.add_option("", "--excess-bw", type="float", 
default=_def_excess_bw,
                           help="set RRC excess bandwith factor 
[default=%default] (PSK)")
         parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=True,
+                          action="store_false", default=_def_gray_code,
                           help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", default=0.05,
+        parser.add_option("", "--costas-alpha", type="float", 
default=_def_costas_alpha,
                           help="set Costas loop alpha value [default=%default] 
(PSK)")
-        parser.add_option("", "--gain-mu", type="float", default=0.05,
+        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
                           help="set M&M symbol sync loop gain mu value 
[default=%default] (PSK)")
-        parser.add_option("", "--mu", type="float", default=0.005,
+        parser.add_option("", "--mu", type="float", default=_def_mu,
                           help="set M&M symbol sync loop mu value 
[default=%default] (PSK)")
     add_options=staticmethod(add_options)
 

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
      2006-09-22 20:33:17 UTC (rev 3623)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
      2006-09-22 21:46:44 UTC (rev 3624)
@@ -37,7 +37,17 @@
 
 class gmsk_mod(gr.hier_block):
 
-    def __init__(self, fg, samples_per_symbol=2, bt=0.35, verbose=True, 
log=False):
+    # default values (used in __init__ and add_options)
+    _def_samples_per_symbol = 2
+    _def_bt = 0.35
+    _def_verbose = False
+    _def_log = False
+
+    def __init__(self, fg,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 bt=_def_bt,
+                 verbose=_def_verbose,
+                 log=_def_log):
         """
        Hierarchical block for Gaussian Minimum Shift Key (GMSK)
        modulation.
@@ -123,7 +133,7 @@
         """
         Adds GMSK modulation-specific options to the standard parser
         """
-        parser.add_option("", "--bt", type="float", default=0.35,
+        parser.add_option("", "--bt", type="float", default=_def_bt,
                           help="set bandwidth-time product [default=%default] 
(GMSK)")
     add_options=staticmethod(add_options)
 
@@ -144,10 +154,23 @@
 
 class gmsk_demod(gr.hier_block):
 
-    def __init__(self, fg, samples_per_symbol=2,
-                 omega=None, gain_mu=0.05, mu=0.5,
-                 omega_relative_limit=0.005, freq_error=0.0,
-                 verbose=True, log=False):
+    # default values (used in __init__ and add_options)
+    _def_samples_per_symbol = 2
+    _def_gain_mu = 0.05
+    _def_mu = 0.5
+    _def_omega_relative_limit = 0.005
+    _def_freq_error = 0.0
+    _def_verbose = False
+    _def_log = False
+    
+    def __init__(self, fg,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 gain_mu=_def_gain_mu,
+                 mu=_def_mu,
+                 omega_relative_limit=_def_omega_relative_limit,
+                 freq_error=_def_freq_error,
+                 verbose=_def_verbose,
+                 log=_def_log):
         """
        Hierarchical block for Gaussian Minimum Shift Key (GMSK)
        demodulation.
@@ -166,8 +189,6 @@
 
         Clock recovery parameters.  These all have reasonble defaults.
         
-        @param omega: nominal relative freq (defaults to samples_per_symbol)
-        @type omega: float
         @param gain_mu: controls rate of mu adjustment
         @type gain_mu: float
         @param mu: fractional delay [0.0, 1.0]
@@ -180,7 +201,6 @@
 
         self._fg = fg
         self._samples_per_symbol = samples_per_symbol
-        self._omega = omega
         self._gain_mu = gain_mu
         self._mu = mu
         self._omega_relative_limit = omega_relative_limit
@@ -189,8 +209,7 @@
         if samples_per_symbol < 2:
             raise TypeError, "samples_per_symbol >= 2, is %f" % 
samples_per_symbol
 
-        if self._omega is None:
-            self._omega = samples_per_symbol*(1+self._freq_error)
+        self._omega = samples_per_symbol*(1+self._freq_error)
 
        self._gain_omega = .25 * self._gain_mu * self._gain_mu        # 
critically damped
 
@@ -254,15 +273,15 @@
         """
         Adds GMSK demodulation-specific options to the standard parser
         """
-        parser.add_option("", "--omega", type="float", default=None,
+        parser.add_option("", "--omega", type="float", default=_def_omega,
                           help="M&M clock recovery omega [default=%default] 
(GMSK)")
-        parser.add_option("", "--gain-mu", type="float", default=0.05,
+        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
                           help="M&M clock recovery gain mu [default=%default] 
(GMSK/PSK)")
-        parser.add_option("", "--mu", type="float", default=0.5,
+        parser.add_option("", "--mu", type="float", default=_def_mu,
                           help="M&M clock recovery mu [default=%default] 
(GMSK/PSK)")
-        parser.add_option("", "--omega-relative-limit", type="float", 
default=0.005,
+        parser.add_option("", "--omega-relative-limit", type="float", 
default=_def_omega_relative_limit,
                           help="M&M clock recovery omega relative limit 
[default=%default] (GMSK/PSK)")
-        parser.add_option("", "--freq-error", type="float", default=0.0,
+        parser.add_option("", "--freq-error", type="float", 
default=_def_freq_error,
                           help="M&M clock recovery frequency error 
[default=%default] (GMSK)")
     add_options=staticmethod(add_options)