[Commit-gnuradio] r11292 - gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl

[trondeau]

Author: trondeau
Date: 2009-06-25 21:37:46 -0600 (Thu, 25 Jun 2009)
New Revision: 11292

Added:
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py
Modified:
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
Log:
Adding a hier_block2 pfb_channelizer that takes care of taking the input and 
making a series of output streams; masks the handling of the input/output.

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
   2009-06-26 02:42:28 UTC (rev 11291)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
   2009-06-26 03:37:46 UTC (rev 11292)
@@ -47,6 +47,7 @@
        ofdm_sync_pn.py         \
        ofdm_sync_pnac.py       \
        ofdm_sync_ml.py         \
+       pfb_channelizer.py      \
        pkt.py                  \
        psk.py                  \
        qam.py                  \

Added: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py
                            (rev 0)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py
    2009-06-26 03:37:46 UTC (rev 11292)
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+from gnuradio import gr
+
+class pfb_channelizer_ccf(gr.hier_block2):
+    '''
+    Make a Polyphase Filter channelizer (complex in, complex out, 
floating-point taps)
+    This simplifies the interface by allowing a single input stream to connect 
to this block.
+    It will then output a series of streams for each channel out.
+    '''
+    def __init__(self, numchans, taps):
+       gr.hier_block2.__init__(self, "pfb_channelizer_ccf",
+                               gr.io_signature(1, 1, gr.sizeof_gr_complex), # 
Input signature
+                               gr.io_signature(numchans, numchans, 
gr.sizeof_gr_complex)) # Output signature
+
+        self._numchans = numchans
+        self._taps = taps
+
+        self.s2ss = gr.stream_to_streams(gr.sizeof_gr_complex, self._numchans)
+        self.pfb = gr.pfb_channelizer_ccf(self._numchans, self._taps)
+        self.v2s = gr.vector_to_streams(gr.sizeof_gr_complex, self._numchans)
+
+        self.connect(self, self.s2ss)
+
+        for i in xrange(self._numchans):
+            self.connect((self.s2ss,i), (self.pfb,i))
+
+        # Get independent streams from the filterbank and send them out
+        self.connect(self.pfb, self.v2s)
+
+        for i in xrange(self._numchans):
+            self.connect((self.v2s,i), (self,i))
+
+        
+        
+