[Commit-gnuradio] r4661 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl

[trondeau]

Author: trondeau
Date: 2007-02-27 10:45:35 -0700 (Tue, 27 Feb 2007)
New Revision: 4661

Modified:
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
Log:
Adjustments to constants; these worked in good SNR for all different samples 
per symbol and many different data rates from 71 kbps to 500 kbps.


Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
      2007-02-27 17:42:25 UTC (rev 4660)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
      2007-02-27 17:45:35 UTC (rev 4661)
@@ -39,8 +39,8 @@
 _def_verbose = False
 _def_log = False
 
-_def_costas_alpha = 0.5
-_def_gain_mu = 0.3
+_def_costas_alpha = 0.175
+_def_gain_mu = 0.175
 _def_mu = 0.5
 _def_omega_relative_limit = 0.005
 
@@ -252,8 +252,8 @@
         self._mm_omega = self._samples_per_symbol
         self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
         self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.05
-        fmax = 0.05
+        fmin = -0.025
+        fmax = 0.025
 
         self.receiver=gr.mpsk_receiver_cc(arity, 0,
                                          self._costas_alpha, self._costas_beta,
@@ -339,7 +339,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=None,
+        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=_def_gain_mu,
                           help="set M&M symbol sync loop gain mu value 
[default=%default] (PSK)")

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
      2007-02-27 17:42:25 UTC (rev 4660)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
      2007-02-27 17:45:35 UTC (rev 4661)
@@ -39,7 +39,7 @@
 _def_verbose = False
 _def_log = False
 
-_def_costas_alpha = 0.15
+_def_costas_alpha = 0.1
 _def_gain_mu = 0.1
 _def_mu = 0.5
 _def_omega_relative_limit = 0.005
@@ -253,10 +253,10 @@
         self._mm_omega = self._samples_per_symbol
         self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
         self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.1
-        fmax = 0.1
+        fmin = -0.025
+        fmax = 0.025
         
-        self.receiver=gr.mpsk_receiver_cc(arity, pi/2.0,
+        self.receiver=gr.mpsk_receiver_cc(arity, 0,
                                          self._costas_alpha, self._costas_beta,
                                          fmin, fmax,
                                          self._mm_mu, self._mm_gain_mu,

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
      2007-02-27 17:42:25 UTC (rev 4660)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
      2007-02-27 17:45:35 UTC (rev 4661)
@@ -39,8 +39,8 @@
 _def_verbose = False
 _def_log = False
 
-_def_costas_alpha = 0.15
-_def_gain_mu = 0.1
+_def_costas_alpha = 0.175
+_def_gain_mu = 0.175
 _def_mu = 0.5
 _def_omega_relative_limit = 0.005
 
@@ -248,12 +248,11 @@
             ntaps)
         self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
 
-        # symbol clock recovery
         self._mm_omega = self._samples_per_symbol
         self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
         self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.01
-        fmax = 0.01
+        fmin = -0.025
+        fmax = 0.025
         
         self.receiver=gr.mpsk_receiver_cc(arity, pi/4.0,
                                           self._costas_alpha, 
self._costas_beta,
@@ -337,7 +336,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=None,
+        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=_def_gain_mu,
                           help="set M&M symbol sync loop gain mu value 
[default=%default] (PSK)")

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
       2007-02-27 17:42:25 UTC (rev 4660)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
       2007-02-27 17:45:35 UTC (rev 4661)
@@ -37,7 +37,7 @@
 _def_verbose = False
 _def_log = False
 
-_def_gain_mu = 0.05
+_def_gain_mu = 0.175
 _def_mu = 0.5
 _def_freq_error = 0.0
 _def_omega_relative_limit = 0.005