Changeset 8705

Show
Ignore:
Timestamp:
06/25/08 14:01:28
Author:
jcorgan
Message:

Applied changset r8508 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py

    r8701 r8705  
    2424 
    2525class channel_model(gr.hier_block2): 
    26     def __init__(self, noise_voltage=0.0, frequency_offset=0.0, epsilon=1.0, taps=[1.0,0.0]): 
     26    def __init__(self, noise_voltage=0.0, frequency_offset=0.0, epsilon=1.0, taps=[1.0,0.0], noise_seed=3021): 
    2727        ''' Creates a channel model that includes: 
    2828          - AWGN noise power in terms of noise voltage 
     
    4141         
    4242        self.noise_adder = gr.add_cc() 
    43         self.noise = gr.noise_source_c(gr.GR_GAUSSIAN,noise_voltage
     43        self.noise = gr.noise_source_c(gr.GR_GAUSSIAN, noise_voltage, noise_seed
    4444        self.freq_offset = gr.sig_source_c(1, gr.GR_SIN_WAVE, frequency_offset, 1.0, 0.0) 
    4545        self.mixer_offset = gr.multiply_cc() 
     
    6161    def set_taps(self, taps): 
    6262        self.multipath.set_taps(taps) 
     63 
     64    def set_timing_offset(self, epsilon): 
     65        self.timing_offset.set_interp_ratio(epsilon)