[Commit-gnuradio] r4611 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm

[trondeau]

Author: trondeau
Date: 2007-02-23 09:54:07 -0700 (Fri, 23 Feb 2007)
New Revision: 4611

Modified:
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
   gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm.py
Log:
Modifications to use improved correlator


Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
      2007-02-23 16:53:49 UTC (rev 4610)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
      2007-02-23 16:54:07 UTC (rev 4611)
@@ -80,8 +80,8 @@
             self.channel = awgn_channel(self, options.sample_rate, 
noise_voltage, frequency_offset)
             self.multipath = multipath_channel(self)
             
-            self.connect(self.txpath, self.throttle, self.multipath, 
self.channel)
-            #self.connect(self.txpath, self.throttle, self.channel)
+            #self.connect(self.txpath, self.throttle, self.multipath, 
self.channel)
+            self.connect(self.txpath, self.throttle, self.channel)
             self.connect(self.channel, self.rxpath)
             self.connect(self.txpath, gr.file_sink(gr.sizeof_gr_complex, 
"tx_ofdm.dat"))
         else:

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm.py    
    2007-02-23 16:53:49 UTC (rev 4610)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm.py    
    2007-02-23 16:54:07 UTC (rev 4611)
@@ -114,7 +114,8 @@
 
         # OFDM Demod
         self.fft_demod = gr.fft_vcc(self._fft_length, True, win, True)
-        self.ofdm_corr  = gr.ofdm_correlator(self._occupied_tones, 
self._fft_length, ks1, ks2)
+        self.ofdm_corr  = gr.ofdm_correlator(self._occupied_tones, 
self._fft_length,
+                                             self._cp_length, ks1, ks2)
         self.ofdm_demod = gr.ofdm_bpsk_demapper(self._occupied_tones)