[Commit-gnuradio] r6487 - gnuradio/trunk/gnuradio-core/src/python/gnuradio/blks2impl

[jcorgan]

Author: jcorgan
Date: 2007-09-20 11:13:52 -0600 (Thu, 20 Sep 2007)
New Revision: 6487

Modified:
   gnuradio/trunk/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
Log:
Converted blks2.channel_model to hier_block2 format.

Modified: 
gnuradio/trunk/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
===================================================================
--- gnuradio/trunk/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py 
2007-09-20 03:34:27 UTC (rev 6486)
+++ gnuradio/trunk/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py 
2007-09-20 17:13:52 UTC (rev 6487)
@@ -22,16 +22,19 @@
 
 from gnuradio import gr
 
-class channel_model(gr.hier_block):
-    def __init__(self, fg, noise_voltage=0.0, frequency_offset=0.0, 
epsilon=1.0, taps=[1.0,0.0]):
+class channel_model(gr.hier_block2):
+    def __init__(self, noise_voltage=0.0, frequency_offset=0.0, epsilon=1.0, 
taps=[1.0,0.0]):
         ''' Creates a channel model that includes:
           - AWGN noise power in terms of noise voltage
           - A frequency offest in the channel in ratio
           - A timing offset ratio to model clock difference (epsilon)
           - Multipath taps
           '''
+       gr.hier_block2.__init__(self, "channel_model",
+                               gr.io_signature(1, 1, gr.sizeof_gr_complex), # 
Input signature
+                               gr.io_signature(1, 1, gr.sizeof_gr_complex)) # 
Output signature
 
-        print epsilon
+        #print epsilon
         self.timing_offset = gr.fractional_interpolator_cc(0, epsilon)
         
         self.multipath = gr.fir_filter_ccc(1, taps)
@@ -41,14 +44,14 @@
         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.timing_offset, self.multipath)
-        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))
+        self.connect(self, self.timing_offset, self.multipath)
+        self.connect(self.multipath, (self.mixer_offset,0))
+        self.connect(self.freq_offset,(self.mixer_offset,1))
+        self.connect(self.mixer_offset, (self.noise_adder,1))
+        self.connect(self.noise, (self.noise_adder,0))
+        self.connect(self.noise_adder, self)
+       
         
-        gr.hier_block.__init__(self, fg, self.timing_offset, self.noise_adder)
-        
     def set_noise_voltage(noise_voltage):
         self.noise.set_amplitude(noise_voltage)