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

[eb]

Author: eb
Date: 2006-09-26 19:24:29 -0600 (Tue, 26 Sep 2006)
New Revision: 3651

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
Log:
Changed defaults to those recommended by trondeau.  Also arranged that
BPSK and QPSK can have different defaults for --costas-alpha.


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-27 01:22:54 UTC (rev 3650)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
     2006-09-27 01:24:29 UTC (rev 3651)
@@ -39,7 +39,7 @@
 _def_verbose = False
 _def_log = False
 
-_def_costas_alpha = 0.10
+_def_costas_alpha = 0.05
 _def_gain_mu = 0.03
 _def_mu = 0.05
 _def_omega_relative_limit = 0.005
@@ -244,7 +244,7 @@
         # FIXME: need to decide how to handle this more generally; do we pull 
it from higher layer?
         costas_order = 2
         beta = .25 * self._costas_alpha * self._costas_alpha
-        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.005, 
-0.005, costas_order)
+        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.002, 
-0.002, costas_order)
 
         # RRC data filter
         ntaps = 11 * self._samples_per_symbol
@@ -345,7 +345,7 @@
         parser.add_option("", "--no-gray-code", dest="gray_code",
                           action="store_false", default=_def_gray_code,
                           help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", 
default=_def_costas_alpha,
+        parser.add_option("", "--costas-alpha", type="float", default=None,
                           help="set Costas loop alpha value [default=%default] 
(PSK)")
         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)")

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-27 01:22:54 UTC (rev 3650)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
     2006-09-27 01:24:29 UTC (rev 3651)
@@ -242,7 +242,7 @@
         costas_order = 4
         beta = .25 * self._costas_alpha * self._costas_alpha
         #self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.1, 
-0.1, costas_order)
-        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.005, 
-0.005, costas_order)
+        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.002, 
-0.002, costas_order)
 
         # RRC data filter
         ntaps = 11 * samples_per_symbol
@@ -346,7 +346,7 @@
         parser.add_option("", "--no-gray-code", dest="gray_code",
                           action="store_false", default=_def_gray_code,
                           help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", 
default=_def_costas_alpha,
+        parser.add_option("", "--costas-alpha", type="float", default=None,
                           help="set Costas loop alpha value [default=%default] 
(PSK)")
         parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
                           help="set M&M symbol sync loop gain mu value 
[default=%default] (PSK)")