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

[trondeau]

Author: trondeau
Date: 2007-03-06 19:10:32 -0700 (Tue, 06 Mar 2007)
New Revision: 4730

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/dqpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
Log:
updates to default values; there is no one size fits all

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-03-07 01:52:38 UTC (rev 4729)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
      2007-03-07 02:10:32 UTC (rev 4730)
@@ -40,7 +40,7 @@
 _def_log = False
 
 _def_costas_alpha = 0.1
-_def_gain_mu = 0.1
+_def_gain_mu = None
 _def_mu = 0.5
 _def_omega_relative_limit = 0.005
 
@@ -250,6 +250,9 @@
         self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
 
         # symbol clock recovery
+        if not self._mm_gain_mu:
+            self._mm_gain_mu = 0.1
+            
         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

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-03-07 01:52:38 UTC (rev 4729)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
      2007-03-07 02:10:32 UTC (rev 4730)
@@ -39,8 +39,8 @@
 _def_verbose = False
 _def_log = False
 
-_def_costas_alpha = 0.175
-_def_gain_mu = 0.175
+_def_costas_alpha = 0.15
+_def_gain_mu = None
 _def_mu = 0.5
 _def_omega_relative_limit = 0.005
 
@@ -248,6 +248,10 @@
             ntaps)
         self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
 
+        if not self._mm_gain_mu:
+            sbs_to_mm = {2: 0.050, 3: 0.075, 4: 0.11, 5: 0.125, 6: 0.15, 7: 
0.15}
+            self._mm_gain_mu = sbs_to_mm[samples_per_symbol]
+
         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

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-03-07 01:52:38 UTC (rev 4729)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
       2007-03-07 02:10:32 UTC (rev 4730)
@@ -37,7 +37,7 @@
 _def_verbose = False
 _def_log = False
 
-_def_gain_mu = 0.175
+_def_gain_mu = None
 _def_mu = 0.5
 _def_freq_error = 0.0
 _def_omega_relative_limit = 0.005
@@ -208,6 +208,9 @@
 
         self._omega = samples_per_symbol*(1+self._freq_error)
 
+        if not self._gain_mu:
+            self._gain_mu = 0.175
+            
        self._gain_omega = .25 * self._gain_mu * self._gain_mu        # 
critically damped
 
        # Demodulate FM