Converted blks2.channel_model to hier_block2 format.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6487 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py b/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
index 21980a22e54109db36d03690c8d3a5af453e2a3d..2e2ac6e27941bfdfa04727d95802ef77bb92f3c5 100644 (file)
--- a/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
@@ -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,13 +44,13 @@ class channel_model(gr.hier_block):
         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))
-        
-        gr.hier_block.__init__(self, fg, self.timing_offset, self.noise_adder)
+        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)
+       
         
     def set_noise_voltage(noise_voltage):
         self.noise.set_amplitude(noise_voltage)