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

[trondeau]

Author: trondeau
Date: 2009-08-11 17:24:29 -0600 (Tue, 11 Aug 2009)
New Revision: 11578

Modified:
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
   
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_decimator.py
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_interpolator.py
Log:
Mostly documentation for using the PFB blocks, some fixes for new code.

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
  2009-08-11 23:22:20 UTC (rev 11577)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
  2009-08-11 23:24:29 UTC (rev 11578)
@@ -24,17 +24,23 @@
 
 class pfb_arb_resampler_ccf(gr.hier_block2):
     '''
+    Convinience wrapper for the polyphase filterbank arbitrary resampler.
 
+    The block takes a single complex stream in and outputs a single complex
+    stream out. As such, it requires no extra glue to handle the input/output
+    streams. This block is provided to be consistent with the interface to the
+    other PFB block.
     '''
-    def __init__(self, rate, taps):
+    def __init__(self, rate, taps, flt_size=32):
        gr.hier_block2.__init__(self, "pfb_arb_resampler_ccf",
                                gr.io_signature(1, 1, gr.sizeof_gr_complex), # 
Input signature
                                gr.io_signature(1, 1, gr.sizeof_gr_complex)) # 
Output signature
-
+        
         self._rate = rate
         self._taps = taps
+        self._size = flt_size
 
-        self.pfb = gr.pfb_arb_resampler_ccf(self._rate, self._taps)
+        self.pfb = gr.pfb_arb_resampler_ccf(self._rate, self._taps, self._size)
 
         self.connect(self, self.pfb)
         self.connect(self.pfb, self)

Modified: 
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
    2009-08-11 23:22:20 UTC (rev 11577)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py
    2009-08-11 23:24:29 UTC (rev 11578)
@@ -25,8 +25,9 @@
 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.
+    It will then output a stream for each channel.
     '''
     def __init__(self, numchans, taps):
        gr.hier_block2.__init__(self, "pfb_channelizer_ccf",

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_decimator.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_decimator.py
      2009-08-11 23:22:20 UTC (rev 11577)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_decimator.py
      2009-08-11 23:24:29 UTC (rev 11578)
@@ -25,6 +25,7 @@
 class pfb_decimator_ccf(gr.hier_block2):
     '''
     Make a Polyphase Filter decimator (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 stream that is the decimated output stream.
     '''

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_interpolator.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_interpolator.py
   2009-08-11 23:22:20 UTC (rev 11577)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/pfb_interpolator.py
   2009-08-11 23:24:29 UTC (rev 11578)
@@ -25,8 +25,11 @@
 class pfb_interpolator_ccf(gr.hier_block2):
     '''
     Make a Polyphase Filter interpolator (complex in, complex out, 
floating-point taps)
-    This interface is very simple, but the block is made here to keep it 
consistent with
-    the other PFB filter implementations.
+
+    The block takes a single complex stream in and outputs a single complex
+    stream out. As such, it requires no extra glue to handle the input/output
+    streams. This block is provided to be consistent with the interface to the
+    other PFB block.
     '''
     def __init__(self, interp, taps):
        gr.hier_block2.__init__(self, "pfb_interpolator_ccf",