[Commit-gnuradio] r5748 - gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl

[trondeau]

Author: trondeau
Date: 2007-06-08 13:57:46 -0600 (Fri, 08 Jun 2007)
New Revision: 5748

Modified:
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm.py
Log:
fixed demod to store options so print verbage works

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm.py
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm.py
     2007-06-08 19:51:29 UTC (rev 5747)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/python/gnuradio/blksimpl/ofdm.py
     2007-06-08 19:57:46 UTC (rev 5748)
@@ -176,14 +176,21 @@
        """
         self._rcvd_pktq = gr.msg_queue()          # holds packets from the PHY
 
+        self._modulation = options.modulation
+        self._fft_length = options.fft_length
+        self._occupied_tones = options.occupied_tones
+        self._cp_length = options.cp_length
+        self._snr = options.snr
+
+
         # Use freq domain to get doubled-up known symbol for correlation in 
time domain
-        ksfreq = known_symbols_4512_3[0:options.occupied_tones]
+        ksfreq = known_symbols_4512_3[0:self._occupied_tones]
         for i in range(len(ksfreq)):
             if(i&1):
                 ksfreq[i] = 0        
 
-        zeros_on_left = int(math.ceil((options.fft_length - 
options.occupied_tones)/2.0))
-        zeros_on_right = options.fft_length - options.occupied_tones - 
zeros_on_left
+        zeros_on_left = int(math.ceil((self._fft_length - 
self._occupied_tones)/2.0))
+        zeros_on_right = self._fft_length - self._occupied_tones - 
zeros_on_left
         ks0 = zeros_on_left*[0.0,]
         ks0.extend(ksfreq)
         ks0.extend(zeros_on_right*[0.0,])
@@ -194,16 +201,16 @@
 
         # hard-coded known symbols
         preambles = (ks0time,
-                     known_symbols_4512_1[0:options.occupied_tones],
-                     known_symbols_4512_2[0:options.occupied_tones])
+                     known_symbols_4512_1[0:self._occupied_tones],
+                     known_symbols_4512_2[0:self._occupied_tones])
         
-        symbol_length = options.fft_length + options.cp_length
-        self.ofdm_recv = ofdm_receiver(fg, options.fft_length, 
options.cp_length,
-                                       options.occupied_tones, options.snr, 
preambles,
+        symbol_length = self._fft_length + self._cp_length
+        self.ofdm_recv = ofdm_receiver(fg, self._fft_length, self._cp_length,
+                                       self._occupied_tones, self._snr, 
preambles,
                                        options.log)
         self.ofdm_demod = gr.ofdm_frame_sink(self._rcvd_pktq,
-                                             options.occupied_tones,
-                                             options.modulation)
+                                             self._occupied_tones,
+                                             self._modulation)
         
         fg.connect((self.ofdm_recv, 0), (self.ofdm_demod, 0))
         fg.connect((self.ofdm_recv, 1), (self.ofdm_demod, 1))