[Commit-gnuradio] r11279 - gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter

[trondeau]

Author: trondeau
Date: 2009-06-24 19:57:58 -0600 (Wed, 24 Jun 2009)
New Revision: 11279

Modified:
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/channelize.py
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_filter_ccf.cc
Log:
Almost there with the right order of samples into the filter. Half of the 
output filters work and the other half don't.

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/channelize.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/channelize.py
        2009-06-25 01:46:39 UTC (rev 11278)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/channelize.py
        2009-06-25 01:57:58 UTC (rev 11279)
@@ -14,7 +14,7 @@
         self._N = 200000
         self._fs = 10000
         self._M = 9
-        self._taps = gr.firdes.low_pass(1, self._fs, 100, 10)
+        self._taps = gr.firdes.low_pass(1, self._fs, 200, 20)
         fc = 200
 
         tpc = math.ceil(float(len(self._taps)) /  float(self._M))
@@ -25,7 +25,7 @@
         
         self.signals = list()
         self.add = gr.add_cc()
-        freqs = [10, 1020, 2040, 3050, 4060]
+        freqs = [-4070, -3050, -2030, -1010, 10, 1020, 2040, 3060, 4080]
         for i in xrange(len(freqs)):
             self.signals.append(gr.sig_source_c(self._fs, gr.GR_SIN_WAVE, 
freqs[i], 1))
             self.connect(self.signals[i], (self.add,i))

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_filter_ccf.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_filter_ccf.cc
 2009-06-25 01:46:39 UTC (rev 11278)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/gr_pfb_filter_ccf.cc
 2009-06-25 01:57:58 UTC (rev 11279)
@@ -122,9 +122,9 @@
     for(int j = d_numchans-1; j >= 0; j--) {
       // Move all values in delay line forward to make room for new value
       for(unsigned int k = 0; k < d_taps_per_filter-1; k++) {
-       d_delay_line[j][k+1] = d_delay_line[j][k];
+       d_delay_line[j][k] = d_delay_line[j][k+1];
       }
-      d_delay_line[j][0] = in[0]; // add new value to delay line
+      d_delay_line[j][d_taps_per_filter-1] = in[0]; // add new value to delay 
line
       in++;
       count++;