[Commit-gnuradio] r5659 - gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm

[trondeau]

Author: trondeau
Date: 2007-06-03 21:10:35 -0600 (Sun, 03 Jun 2007)
New Revision: 5659

Modified:
   
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
Log:
removed channel model here to use new blks channel model; added clock rate 
ratio to simulation

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
    2007-06-04 03:09:28 UTC (rev 5658)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
    2007-06-04 03:10:35 UTC (rev 5659)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005, 2006 Free Software Foundation, Inc.
+# Copyright 2006, 2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,8 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import usrp
+from gnuradio import gr, blks
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
@@ -33,24 +32,7 @@
 from transmit_path import transmit_path
 from receive_path import receive_path
 
-class channel_model(gr.hier_block):
-    def __init__(self, fg, sample_rate, noise_voltage, frequency_offset, taps):
 
-        self.multipath = gr.fir_filter_ccc(1, taps)
-
-        self.noise_adder = gr.add_cc()
-        self.noise = gr.noise_source_c(gr.GR_GAUSSIAN,noise_voltage)
-        self.freq_offset = gr.sig_source_c(1, gr.GR_SIN_WAVE, 
frequency_offset, 1.0, 0.0)
-        self.mixer_offset = gr.multiply_cc()
-
-        fg.connect(self.multipath, (self.mixer_offset,0))
-        fg.connect(self.freq_offset,(self.mixer_offset,1))
-        fg.connect(self.mixer_offset, (self.noise_adder,1))
-        fg.connect(self.noise, (self.noise_adder,0))
-
-
-        gr.hier_block.__init__(self, fg, self.multipath, self.noise_adder)
-
 class my_graph(gr.flow_graph):
     def __init__(self, callback, options):
         gr.flow_graph.__init__(self)
@@ -89,7 +71,7 @@
 
         self.mux = gr.stream_mux(gr.sizeof_gr_complex, stream_size)
         self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
-        self.channel = channel_model(self, options.sample_rate, noise_voltage, 
frequency_offset, taps)
+        self.channel = blks.channel_model(self, noise_voltage, 
frequency_offset, options.clockrate_ratio, taps)
         self.rxpath = receive_path(self, callback, options)
                 
         self.connect(self.zeros, (self.mux,0))
@@ -144,6 +126,8 @@
                       help="set the SNR of the channel in dB 
[default=%default]")
     parser.add_option("", "--frequency-offset", type="eng_float", default=0,
                       help="set frequency offset introduced by channel 
[default=%default]")
+    parser.add_option("", "--clockrate-ratio", type="eng_float", default=1.0,
+                      help="set clock rate ratio (sample rate difference) 
between two systems [default=%default]")
     parser.add_option("","--discontinuous", type="int", default=0,
                       help="enable discontinous transmission, burst of N 
packets [Default is continuous]")
     parser.add_option("","--channel-on", action="store_true", default=True,