[Commit-gnuradio] r4674 - gnuradio/branches/developers/jcorgan/est/gnuradio-examples/python/hier/sounder

[jcorgan]

Author: jcorgan
Date: 2007-03-01 09:14:39 -0700 (Thu, 01 Mar 2007)
New Revision: 4674

Modified:
   
gnuradio/branches/developers/jcorgan/est/gnuradio-examples/python/hier/sounder/sounder_rx.py
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/est/gnuradio-examples/python/hier/sounder/sounder_rx.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/est/gnuradio-examples/python/hier/sounder/sounder_rx.py
        2007-03-01 16:08:47 UTC (rev 4673)
+++ 
gnuradio/branches/developers/jcorgan/est/gnuradio-examples/python/hier/sounder/sounder_rx.py
        2007-03-01 16:14:39 UTC (rev 4674)
@@ -53,6 +53,8 @@
         min_chips = int(math.ceil(2.0*self._max_delay * self._chip_rate))
         degree = int(math.ceil(math.log(min_chips)/math.log(2)))
         self._length = 2**degree-1
+        self._seq_per_sec = self._chip_rate/self._length
+        self._tap = 0.0001
 
         if self._verbose:
             print "Actual chip rate is", n2s(self._chip_rate), "chips/sec"
@@ -60,14 +62,17 @@
             print "Using specified maximum delay spread of", self._max_delay, 
"sec"
             print "Mininum sequence length needed is", n2s(min_chips), "chips"
             print "Using PN sequence of degree", degree, "length", self._length
+            print "Sequences per second is", self._seq_per_sec
+            print "IIR tap is", self._tap
         
         self.define_component("s2v", gr.stream_to_vector(gr.sizeof_gr_complex, 
self._length))
-        window = (1.0,)*self._length
-        self.define_component("fft", gr.fft_vcc(self._length, True, window))
-        self.define_component("v2s", gr.vector_to_stream(gr.sizeof_gr_complex, 
self._length))
-        self.define_component("sink", gr.file_sink(gr.sizeof_gr_complex, 
"FFT.dat"))
+        self.define_component("fft", gr.fft_vcc(self._length, True, ())) # No 
window needed
+        self.define_component("avg", gr.single_pole_iir_filter_cc(self._tap, 
self._length))
+        self.define_component("keep", 
gr.keep_one_in_n(gr.sizeof_gr_complex*self._length, int(self._seq_per_sec)))
+        self.define_component("sink", 
gr.file_sink(gr.sizeof_gr_complex*self._length, "FFT.dat"))
 
         self.connect("usrp", 0, "s2v", 0)
         self.connect("s2v", 0, "fft", 0)
-        self.connect("fft", 0, "v2s", 0)
-        self.connect("v2s", 0, "sink", 0)
+        self.connect("fft", 0, "avg", 0)
+        self.connect("avg", 0, "keep", 0)
+        self.connect("keep", 0, "sink", 0)