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

[trondeau]

Author: trondeau
Date: 2006-12-23 15:02:13 -0700 (Sat, 23 Dec 2006)
New Revision: 4188

Modified:
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
Log:
OFDM benchmark code working with channel model

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
      2006-12-23 16:29:24 UTC (rev 4187)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/benchmark_ofdm.py
      2006-12-23 22:02:13 UTC (rev 4188)
@@ -26,7 +26,7 @@
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
-import random, time, struct, sys, math
+import random, time, struct, sys, math, os
 
 # from current dir
 from transmit_path_simple import transmit_path
@@ -39,33 +39,25 @@
         self.input = gr.add_const_cc(0)
         
         self.noise_adder = gr.add_cc()
-        self.noise = gr.noise_source_c(gr.GR_GAUSSIAN,noise_voltage,1)
+        self.noise = gr.noise_source_c(gr.GR_GAUSSIAN,noise_voltage)
         self.offset = gr.sig_source_c((sample_rate*1.0), gr.GR_SIN_WAVE, 
frequency_offset, 1.0, 0.0)
         self.mixer_offset = gr.multiply_cc()
 
         fg.connect(self.input, (self.mixer_offset,0))
         fg.connect(self.offset,(self.mixer_offset,1))
-        fg.connect(self.noise,(self.noise_adder,0))
+        fg.connect(self.mixer_offset, (self.noise_adder,1))
+        fg.connect(self.noise, (self.noise_adder,0))
 
-        if 0:
-            self.throttle = gr.throttle(gr.sizeof_gr_complex, 1e5)
-            fg.connect(self.mixer_offset, self.throttle, (self.noise_adder,1))
-        else:
-            fg.connect(self.mixer_offset, (self.noise_adder,1))
-
         gr.hier_block.__init__(self, fg, self.input, self.noise_adder)
 
 class my_graph(gr.flow_graph):
     def __init__(self, callback, options):
         gr.flow_graph.__init__(self)
 
-        channel_on = False
+        channel_on = True
 
         SNR = 10.0**(options.snr/10.0)
         frequency_offset = options.frequency_offset / options.fft_length
-
-#        print "SNR:              %f" % options.snr
-#        print "Frequency offset: %f" % options.frequency_offset
         
         power_in_signal = options.occupied_tones
         noise_power_in_channel = power_in_signal/SNR
@@ -78,7 +70,7 @@
 
         if channel_on:
             self.channel = awgn_channel(self, options.sample_rate, 
noise_voltage, frequency_offset)
-            self.connect(self.txpath, self.channel)
+            self.connect(self.txpath, self.throttle, self.channel)
             self.connect(self.channel, self.rxpath)
         else:
             self.connect(self.txpath, self.throttle, self.rxpath)