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

[eb]

Author: eb
Date: 2006-09-22 15:56:33 -0600 (Fri, 22 Sep 2006)
New Revision: 3625

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 21:46:44 UTC (rev 3624)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
     2006-09-22 21:56:33 UTC (rev 3625)
@@ -32,20 +32,25 @@
 import Numeric
 from pprint import pprint
 
+# 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_costas_alpha = 0.05
+_def_gain_mu = 0.03
+_def_mu = 0.05
+_def_omega_relative_limit = 0.005
+
+
 # /////////////////////////////////////////////////////////////////////////////
 #                             DBPSK modulator
 # /////////////////////////////////////////////////////////////////////////////
 
 class dbpsk_mod(gr.hier_block):
 
-    # 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,
@@ -176,17 +181,6 @@
 
 class dbpsk_demod(gr.hier_block):
 
-    # 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,

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 21:46:44 UTC (rev 3624)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
     2006-09-22 21:56:33 UTC (rev 3625)
@@ -32,19 +32,25 @@
 import Numeric
 from pprint import pprint
 
+# 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_costas_alpha = 0.05
+_def_gain_mu = 0.03
+_def_mu = 0.05
+_def_omega_relative_limit = 0.005
+
+
 # /////////////////////////////////////////////////////////////////////////////
 #                           DQPSK modulator
 # /////////////////////////////////////////////////////////////////////////////
 
 class dqpsk_mod(gr.hier_block):
 
-    # 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,
@@ -173,17 +179,6 @@
 
 class dqpsk_demod(gr.hier_block):
 
-    # 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,

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 21:46:44 UTC (rev 3624)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
      2006-09-22 21:56:33 UTC (rev 3625)
@@ -31,18 +31,24 @@
 from pprint import pprint
 import inspect
 
+# default values (used in __init__ and add_options)
+_def_samples_per_symbol = 2
+_def_bt = 0.35
+_def_verbose = False
+_def_log = False
+
+_def_gain_mu = 0.05
+_def_mu = 0.5
+_def_freq_error = 0.0
+_def_omega_relative_limit = 0.005
+
+
 # /////////////////////////////////////////////////////////////////////////////
 #                              GMSK modulator
 # /////////////////////////////////////////////////////////////////////////////
 
 class gmsk_mod(gr.hier_block):
 
-    # 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,
@@ -154,15 +160,6 @@
 
 class gmsk_demod(gr.hier_block):
 
-    # 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,
@@ -273,8 +270,6 @@
         """
         Adds GMSK demodulation-specific options to the standard parser
         """
-        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=_def_gain_mu,
                           help="M&M clock recovery gain mu [default=%default] 
(GMSK/PSK)")
         parser.add_option("", "--mu", type="float", default=_def_mu,