[Commit-gnuradio] r7157 - gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl

[trondeau]

Author: trondeau
Date: 2007-12-13 15:49:21 -0700 (Thu, 13 Dec 2007)
New Revision: 7157

Modified:
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
Log:
Moving back to using PN sync code; adding place-holders for new peak_detector2, 
but not enabled yet.

Modified: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
    2007-12-13 22:33:39 UTC (rev 7156)
+++ 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
    2007-12-13 22:49:21 UTC (rev 7157)
@@ -72,7 +72,7 @@
         
         win = [1 for i in range(fft_length)]
 
-        SYNC = "ml"
+        SYNC = "pn"
         if SYNC == "ml":
             self.ofdm_sync = ofdm_sync_ml(fft_length, cp_length, snr, logging)
         elif SYNC == "pn":

Modified: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py
     2007-12-13 22:33:39 UTC (rev 7156)
+++ 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py
     2007-12-13 22:49:21 UTC (rev 7157)
@@ -96,6 +96,7 @@
         self.f2c = gr.float_to_complex()
         self.sampler = gr.ofdm_sampler(fft_length,symbol_length)
         self.pk_detect = gr.peak_detector_fb(0.2, 0.25, 30, 0.0005)
+        #self.pk_detect = gr.peak_detector2_fb()
         self.sample_and_hold = gr.sample_and_hold_ff()
         self.nco = gr.frequency_modulator_fc(nco_sensitivity)
         self.sigmix = gr.multiply_cc()

Modified: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
     2007-12-13 22:33:39 UTC (rev 7156)
+++ 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
     2007-12-13 22:49:21 UTC (rev 7157)
@@ -88,6 +88,7 @@
         #ML measurements input to sampler block and detect
         self.sub1 = gr.add_const_ff(-1)
         self.pk_detect = gr.peak_detector_fb(0.2, 0.25, 30, 0.0005)
+        #self.pk_detect = gr.peak_detector2_fb()
         #self.pk_detect = gr.threshold_detector_fb(0.5)
         self.regen = gr.regenerate_bb(symbol_length)