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

[n4hy]

Author: n4hy
Date: 2006-12-17 11:59:31 -0700 (Sun, 17 Dec 2006)
New Revision: 4112

Modified:
   gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm_test.py
Log:
latest test code

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm_test.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm_test.py    
    2006-12-17 07:41:45 UTC (rev 4111)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm_test.py    
    2006-12-17 18:59:31 UTC (rev 4112)
@@ -62,7 +62,7 @@
 
         cpsize = symbol_length - fftsize
 
-        SNR_db = 10.0
+        SNR_db = 30.0
         SNR = 10.0**(SNR_db/10.0)
 
         power_in_signal = occupied_tones
@@ -83,7 +83,7 @@
         self.cp_adder = gr.ofdm_cyclic_prefixer(fftsize,symbol_length)
         self.noise_adder = gr.add_cc()
         self.noise = gr.noise_source_c(gr.GR_GAUSSIAN,noise_voltage,1)
-        self.offset = 
gr.sig_source_c((sample_rate*1.0),gr.GR_SIN_WAVE,-0.125*sample_rate/fftsize,1.0,0.0)
+        self.offset = 
gr.sig_source_c((sample_rate*1.0),gr.GR_SIN_WAVE,-0.0*sample_rate/fftsize,1.0,0.0)
         self.mixer_offset = gr.multiply_cc()
 
         #self.debugfile = gr.file_sink(gr.sizeof_gr_complex,"debug_out")
@@ -157,13 +157,29 @@
         self.diff = gr.sub_ff()
         self.connect(self.c2mag,(self.diff,0))
         self.connect(self.moving_sum_filter,(self.diff,1))
+
+        #ML measurements input to sampler block and detect
+
+        #self.sampler = 
gr.ofdm_sampler(fftsize,symbol_length,(-fftsize-cpsize))
+        self.sampler = gr.ofdm_sampler(fftsize,symbol_length,1)
+        self.fftdemod = gr.fft_vcc(fftsize,True,win)
+        self.outdem = gr.vector_to_stream(gr.sizeof_gr_complex,fftsize)
+        self.outdat = gr.file_sink(gr.sizeof_gr_complex,"output_data")
+
+        self.connect(self.sampler,self.fftdemod,self.outdem,self.outdat)
+        self.f2c1 = gr.float_to_complex()
+        self.f2c2 = gr.float_to_complex()
         
+        self.connect(self.throttle,(self.sampler,0))
+        self.connect(self.diff,self.f2c1,(self.sampler,1))
+        self.connect(self.angle,self.f2c2,(self.sampler,2))
+        
         self.oscope = scopesink.scope_sink_f(self, panel, 
sample_rate=sample_rate)
 #        self.connect(self.moving_sum_filter,(self.oscope,0))
 #        self.connect(self.c2mag,(self.oscope,1))
         self.connect(self.diff,(self.oscope,0))
         self.connect(self.movingsum2,self.angle,self.scale,(self.oscope,1))
-        
+
         self._build_gui(vbox)
 
     def _set_status_msg(self, msg):