digital: moved gr_binary_slicer_fb to digital_binary_slicer_fb and added QA code. Removed constellation_decoder and everything that dependedon it. Must switch everything to digital_constellation_decoder now. Also moved gmsk to gr-digital. Make check passes.

23 files changed, 122 insertions, 2115 deletions

diff --git a/gnuradio-core/src/guile/tests/general_ctors.test b/gnuradio-core/src/guile/tests/general_ctors.test
index 244249dd8..76198f103 100644
--- a/gnuradio-core/src/guile/tests/general_ctors.test
+++ b/gnuradio-core/src/guile/tests/general_ctors.test
@@ -71,9 +71,6 @@
 ;;; ./general/gr_bin_statistics_f.h WONTFIX: requires gr_feval_dd & swig directors
 ;;;(pass-if (true? (gr:bin-statistics-f 1 (gr:msg-queue) 0 0 0)))
 
-;;; ./general/gr_binary_slicer_fb.h
-(pass-if (true? (gr:binary-slicer-fb)))
-
 ;;; ./general/gr_bytes_to_syms.h
 (pass-if (true? (gr:bytes-to-syms)))
 
@@ -108,9 +105,6 @@
 ;;; ./general/gr_conjugate_cc.h
 (pass-if (true? (gr:conjugate-cc)))
 
-;;; ./general/gr_constellation_decoder_cb.h
-(pass-if (true? (gr:constellation-decoder-cb #(2+3i 23+5i) #(0 1))))
-
 ;;; ./general/gr_copy.h
 (pass-if (true? (gr:copy 1)))
 
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index defbbbb0c..a58f88594 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -44,7 +44,6 @@ libgeneral_la_SOURCES = 		\
 	gr_agc2_ff.cc                	\
 	gr_align_on_samplenumbers_ss.cc	\
 	gr_bin_statistics_f.cc		\
-	gr_binary_slicer_fb.cc		\
 	gr_bytes_to_syms.cc		\
 	gr_char_to_float.cc		\
 	gr_check_counting_s.cc		\
@@ -56,7 +55,6 @@ libgeneral_la_SOURCES = 		\
 	gr_complex_to_xxx.cc		\
 	gr_conjugate_cc.cc		\
 	gr_copy.cc			\
-	gr_constellation_decoder_cb.cc	\
 	gr_correlate_access_code_bb.cc	\
 	gr_costas_loop_cc.cc		\
 	gr_count_bits.cc		\
@@ -202,7 +200,6 @@ grinclude_HEADERS = 			\
 	gr_agc2_ff.h                	\
 	gr_align_on_samplenumbers_ss.h	\
 	gr_bin_statistics_f.h		\
-	gr_binary_slicer_fb.h		\
 	gr_bytes_to_syms.h		\
 	gr_char_to_float.h		\
 	gr_check_counting_s.h		\
@@ -213,7 +210,6 @@ grinclude_HEADERS = 			\
 	gr_complex_to_interleaved_short.h \
 	gr_complex_to_xxx.h		\
 	gr_conjugate_cc.h		\
-	gr_constellation_decoder_cb.h	\
 	gr_copy.h			\
 	gr_correlate_access_code_bb.h	\
 	gr_costas_loop_cc.h		\
@@ -378,7 +374,6 @@ swiginclude_HEADERS =			\
 	gr_agc2_ff.i                 	\
 	gr_align_on_samplenumbers_ss.i	\
 	gr_bin_statistics_f.i		\
-	gr_binary_slicer_fb.i		\
 	gr_bytes_to_syms.i		\
 	gr_char_to_float.i		\
 	gr_check_counting_s.i		\
@@ -388,7 +383,6 @@ swiginclude_HEADERS =			\
 	gr_complex_to_interleaved_short.i \
 	gr_complex_to_xxx.i		\
 	gr_conjugate_cc.i		\
-	gr_constellation_decoder_cb.i	\
 	gr_copy.i			\
 	gr_correlate_access_code_bb.i	\
 	gr_costas_loop_cc.i		\
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index 5a5534129..0dde39a66 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -112,8 +112,6 @@
 #include <gr_unpack_k_bits_bb.h>
 #include <gr_correlate_access_code_bb.h>
 #include <gr_diff_phasor_cc.h>
-#include <gr_constellation_decoder_cb.h>
-#include <gr_binary_slicer_fb.h>
 #include <gr_diff_encoder_bb.h>
 #include <gr_diff_decoder_bb.h>
 #include <gr_framer_sink_1.h>
@@ -239,8 +237,6 @@
 %include "gr_unpack_k_bits_bb.i"
 %include "gr_correlate_access_code_bb.i"
 %include "gr_diff_phasor_cc.i"
-%include "gr_constellation_decoder_cb.i"
-%include "gr_binary_slicer_fb.i"
 %include "gr_diff_encoder_bb.i"
 %include "gr_diff_decoder_bb.i"
 %include "gr_framer_sink_1.i"
diff --git a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc b/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc
deleted file mode 100644
index 5b87f1430..000000000
--- a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_constellation_decoder_cb.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-
-#include <cstdio>
-#include <iostream>
-using std::cout;
-using std::endl;
-
-static const bool compute_EVM = false;
-
-gr_constellation_decoder_cb_sptr
-gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-				  const std::vector<unsigned char> &sym_value_out)
-{
-  return gr_constellation_decoder_cb_sptr 
-		(new gr_constellation_decoder_cb(sym_position, sym_value_out));
-}
-
-gr_constellation_decoder_cb::
-gr_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-			     const std::vector<unsigned char> &sym_value_out)
-  : gr_sync_block ("constellation_decoder_cb",
-		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		   gr_make_io_signature (1, 1, sizeof (unsigned char)))	
-{
-  if (!set_constellation(sym_position,sym_value_out))
-    throw std::invalid_argument("constellation_decoder_cb");
-}
-
-
-gr_constellation_decoder_cb::~gr_constellation_decoder_cb(){}
-
-
-bool
-gr_constellation_decoder_cb::set_constellation(const std::vector<gr_complex> &sym_position, 
-			                       const std::vector<unsigned char> &sym_value_out)
-{
-  if (sym_position.size() != sym_value_out.size())
-    return false;
-
-  if (sym_position.size()<1)
-    return false;
-
-  d_sym_position  = sym_position;
-  d_sym_value_out = sym_value_out;	
-  return true;
-}
-
-
-int
-gr_constellation_decoder_cb::work(int noutput_items,
-				  gr_vector_const_void_star &input_items,
-				  gr_vector_void_star &output_items)
-{
-  gr_complex const *in = (const gr_complex *) input_items[0];
-  unsigned char *out = (unsigned char *) output_items[0];
-  unsigned int table_size = d_sym_value_out.size();
-  unsigned int min_index = 0;
-  float min_euclid_dist = 0;
-  float euclid_dist = 0;
-  double total_error = 0;
-    
-  for(int i = 0; i < noutput_items; i++){
-    min_euclid_dist = norm(in[i] - d_sym_position[0]); 
-    min_index = 0; 
-    for (unsigned int j = 1; j < table_size; j++){
-      euclid_dist = norm(in[i] - d_sym_position[j]);
-      if (euclid_dist < min_euclid_dist){
-	min_euclid_dist = euclid_dist;
-	min_index = j;
-      }
-    }
-
-    out[i] = d_sym_value_out[min_index];
-
-    if (compute_EVM)
-      total_error += sqrtf(min_euclid_dist);
-  }
-
-  if (compute_EVM){
-    double mean = total_error / noutput_items;
-    double rms = sqrt(mean * mean);
-    fprintf(stderr, "EVM = %8.4f\n", rms);
-  }
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h b/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h
deleted file mode 100644
index fd7079c12..000000000
--- a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 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.
- */
-
-#ifndef INCLUDED_GR_CONSTELLATION_DECODER_CB_H
-#define INCLUDED_GR_CONSTELLATION_DECODER_CB_H
-
-#include <gr_sync_block.h>
-#include <vector>
-
-class gr_constellation_decoder_cb;
-typedef boost::shared_ptr<gr_constellation_decoder_cb> gr_constellation_decoder_cb_sptr;
-
-gr_constellation_decoder_cb_sptr 
-	gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position,
-					  const std::vector<unsigned char> &sym_value_out);
-
-/*!
- * \brief Constellation Decoder
- * \ingroup coding_blk
- *
- */
-class gr_constellation_decoder_cb : public gr_sync_block
-{
-
- private:
-  std::vector<gr_complex> d_sym_position;
-  std::vector<unsigned char> d_sym_value_out;
-
-  friend gr_constellation_decoder_cb_sptr 
-		gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 						          const std::vector<unsigned char> &sym_value_out);
-  
-  gr_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-                               const std::vector<unsigned char> &sym_value_out);  //constructor
-
- public:
-  bool set_constellation(const std::vector<gr_complex> &sym_position, 
-                        const std::vector<unsigned char> &sym_value_out);
-
-  ~gr_constellation_decoder_cb();	//destructor
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.i b/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.i
deleted file mode 100644
index 8d9c9b56e..000000000
--- a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.i
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,constellation_decoder_cb)
-
-gr_constellation_decoder_cb_sptr 
-	gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-                                          const std::vector<unsigned char> &sym_value_out);
-
-class gr_constellation_decoder_cb : public gr_sync_block
-{
- private:
-  gr_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-                               const std::vector<unsigned char> &sym_value_out);
-
-  friend gr_constellation_decoder_cb_sptr 
-  	gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 	
-                                          const std::vector<unsigned char> &sym_value_out);
-
- public:
-  int set_constellation(const std::vector<gr_complex> &sym_position, 
-                        const std::vector<unsigned char> &sym_value_out);
-  ~gr_constellation_decoder_cb();
-};
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/d8psk.py b/gnuradio-core/src/python/gnuradio/blks2impl/d8psk.py
deleted file mode 100644
index 67cf9f569..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/d8psk.py
+++ /dev/null
@@ -1,363 +0,0 @@
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential 8PSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 3
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = 0.175
-_def_gain_mu = 0.175
-_def_mu = 0.5
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           D8PSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class d8psk_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "d8psk_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-				
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2,self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol, # gain  (sps since we're interpolating by sps)
-            self._samples_per_symbol, # sampling rate
-            1.0,		      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect & Initialize base class
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-            	     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 3
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "bits per symbol = %d" % self.bits_per_symbol()
-        print "Gray code = %s" % self._gray_code
-        print "RS roll-off factor = %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds 8PSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(d8psk_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           D8PSK demodulator
-#
-# Differentially coherent detection of differentially encoded 8psk
-# /////////////////////////////////////////////////////////////////////////////
-
-class d8psk_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered DQPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param costas_alpha: loop filter gain
-        @type costas_alphas: float
-        @param gain_mu: for M&M block
-        @type gain_mu: float
-        @param mu: for M&M block
-        @type mu: float
-        @param omega_relative_limit: for M&M block
-        @type omega_relative_limit: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-	
-	gr.hier_block2.__init__(self, "d8psk_demod",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._costas_alpha = costas_alpha
-        self._mm_gain_mu = gain_mu
-        self._mm_mu = mu
-        self._mm_omega_relative_limit = omega_relative_limit
-        self._gray_code = gray_code
-
-        if samples_per_symbol < 2:
-            raise TypeError, "sbp must be >= 2, is %d" % samples_per_symbol
-
-        arity = pow(2,self.bits_per_symbol())
- 
-        # Automatic gain control
-        scale = (1.0/16384.0)
-        self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal from full-range to +-1
-        #self.agc = gr.agc_cc(1e-2, 1, 1, 100)
-        self.agc = gr.agc2_cc(1e-1, 1e-2, 1, 1, 100)
-        #self.agc = gr.feedforward_agc_cc(16, 1.0)
-
-        # RRC data filter
-        ntaps = 11 * samples_per_symbol
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            1.0,                      # gain
-            self._samples_per_symbol, # sampling rate
-            1.0,                      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
-
-        # symbol clock recovery
-        self._mm_omega = self._samples_per_symbol
-        self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
-        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.025
-        fmax = 0.025
-
-        self.receiver=gr.mpsk_receiver_cc(arity, 0,
-                                         self._costas_alpha, self._costas_beta,
-                                         fmin, fmax,
-                                         self._mm_mu, self._mm_gain_mu,
-                                         self._mm_omega, self._mm_gain_omega,
-                                         self._mm_omega_relative_limit)
-        
-        # Perform Differential decoding on the constellation
-        self.diffdec = gr.diff_phasor_cc()
-
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
- 
-        # Connect
-        self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 3
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "Costas Loop alpha:   %.2e" % self._costas_alpha
-        print "Costas Loop beta:    %.2e" % self._costas_beta
-        print "M&M mu:              %.2f" % self._mm_mu
-        print "M&M mu gain:         %.2e" % self._mm_gain_mu
-        print "M&M omega:           %.2f" % self._mm_omega
-        print "M&M omega gain:      %.2e" % self._mm_gain_omega
-        print "M&M omega limit:     %.2f" % self._mm_omega_relative_limit
-        
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.pre_scaler,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.connect(self.receiver,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                     gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_gray_decoder.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-    def add_options(parser):
-        """
-        Adds modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", default=_def_costas_alpha,
-                          help="set Costas loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
-                          help="set M&M symbol sync loop gain mu value [default=%default] (PSK)")
-        parser.add_option("", "--mu", type="float", default=_def_mu,
-                          help="set M&M symbol sync loop mu value [default=%default] (PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(
-            d8psk_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-#
-# Add these to the mod/demod registry
-#
-# NOT READY TO BE USED YET -- ENABLE AT YOUR OWN RISK
-modulation_utils.add_type_1_mod('d8psk', d8psk_mod)
-modulation_utils.add_type_1_demod('d8psk', d8psk_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py
deleted file mode 100644
index 55e4890f3..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py
+++ /dev/null
@@ -1,363 +0,0 @@
-#
-# Copyright 2005,2006,2007,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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential BPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = 0.1
-_def_gain_mu = None
-_def_mu = 0.5
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             DBPSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class dbpsk_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered differential BPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-        
-	@param samples_per_symbol: samples per baud >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param log: Log modulation data to files?
-        @type log: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dbpsk_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(self._samples_per_symbol, int) or self._samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % self._samples_per_symbol)
-        
-	ntaps = 11 * self._samples_per_symbol
-
-        arity = pow(2,self.bits_per_symbol())
-        
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        self.chunks2symbols = gr.chunks_to_symbols_bc(psk.constellation[arity])
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol,   # gain (samples_per_symbol since we're
-                                        # interpolating by samples_per_symbol)
-	    self._samples_per_symbol,   # sampling rate
-	    1.0,		        # symbol rate
-	    self._excess_bw,            # excess bandwidth (roll-off factor)
-            ntaps)
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol,
-                                                   self.rrc_taps)
-
-	# Connect
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-        if verbose:
-            self._print_verbage()
-            
-        if log:
-            self._setup_logging()
-            
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # static method that's also callable on an instance
-        return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def add_options(parser):
-        """
-        Adds DBPSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default]")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=True,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(dbpsk_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-    def _print_verbage(self):
-        print "\nModulator:"
-        print "bits per symbol:     %d" % self.bits_per_symbol()
-        print "Gray code:           %s" % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-              
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             DBPSK demodulator
-#
-#      Differentially coherent detection of differentially encoded BPSK
-# /////////////////////////////////////////////////////////////////////////////
-
-class dbpsk_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered differential BPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param costas_alpha: loop filter gain
-        @type costas_alphas: float
-        @param gain_mu: for M&M block
-        @type gain_mu: float
-        @param mu: for M&M block
-        @type mu: float
-        @param omega_relative_limit: for M&M block
-        @type omega_relative_limit: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-        
-	gr.hier_block2.__init__(self, "dbpsk_demod",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-				
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._costas_alpha = costas_alpha
-        self._mm_gain_mu = gain_mu
-        self._mm_mu = mu
-        self._mm_omega_relative_limit = omega_relative_limit
-        self._gray_code = gray_code
-        
-        if samples_per_symbol < 2:
-            raise TypeError, "samples_per_symbol must be >= 2, is %r" % (samples_per_symbol,)
-
-        arity = pow(2,self.bits_per_symbol())
-
-        # Automatic gain control
-        #scale = (1.0/16384.0)
-        #self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal from full-range to +-1
-        self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
-        #self.agc = gr.feedforward_agc_cc(16, 2.0)
-
-        # RRC data filter
-        ntaps = 11 * samples_per_symbol
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            1.0,                      # gain
-            self._samples_per_symbol, # sampling rate
-            1.0,                      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
-
-        # symbol clock recovery
-        if not self._mm_gain_mu:
-            self._mm_gain_mu = 0.1
-
-        self._mm_omega = self._samples_per_symbol
-        self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
-        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.25
-        fmax = 0.25
-        
-        self.receiver=gr.mpsk_receiver_cc(arity, 0,
-                                          self._costas_alpha, self._costas_beta,
-                                          fmin, fmax,
-                                          self._mm_mu, self._mm_gain_mu,
-                                          self._mm_omega, self._mm_gain_omega,
-                                          self._mm_omega_relative_limit)
-            
-        # Do differential decoding based on phase change of symbols
-        self.diffdec = gr.diff_phasor_cc()
-
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-
-        if log:
-            self._setup_logging()
-
-        # Connect and Initialize base class
-        self.connect(self, self.agc, self.rrc_filter, self.receiver,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "Costas Loop alpha:   %.2e" % self._costas_alpha
-        print "Costas Loop beta:    %.2e" % self._costas_beta
-        print "M&M mu:              %.2f" % self._mm_mu
-        print "M&M mu gain:         %.2e" % self._mm_gain_mu
-        print "M&M omega:           %.2f" % self._mm_omega
-        print "M&M omega gain:      %.2e" % self._mm_gain_omega
-        print "M&M omega limit:     %.2f" % self._mm_omega_relative_limit
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.pre_scaler,
-                         gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.connect(self.receiver,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                    gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-        
-    def add_options(parser):
-        """
-        Adds DBPSK demodulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", default=None,
-                          help="set Costas loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
-                          help="set M&M symbol sync loop gain mu value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--mu", type="float", default=_def_mu,
-                          help="set M&M symbol sync loop mu value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--omega-relative-limit", type="float", default=_def_omega_relative_limit,
-                          help="M&M clock recovery omega relative limit [default=%default] (GMSK/PSK)")
-    add_options=staticmethod(add_options)
-    
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(
-                 dbpsk_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-#
-# Add these to the mod/demod registry
-#
-modulation_utils.add_type_1_mod('dbpsk', dbpsk_mod)
-modulation_utils.add_type_1_demod('dbpsk', dbpsk_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py
deleted file mode 100644
index d7bcf5390..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py
+++ /dev/null
@@ -1,369 +0,0 @@
-#
-# Copyright 2009,2010 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential BPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils2
-from math import pi, sqrt, ceil
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_freq_alpha = 0.010
-_def_phase_alpha = 0.1
-_def_timing_alpha = 0.100
-_def_timing_beta = 0.010
-_def_timing_max_dev = 1.5
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             DBPSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class dbpsk2_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered differential BPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-        
-	@param samples_per_symbol: samples per baud >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param log: Log modulation data to files?
-        @type log: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dbpsk_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if self._samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % self._samples_per_symbol)
-        
-        arity = pow(2,self.bits_per_symbol())
-        
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        self.chunks2symbols = gr.chunks_to_symbols_bc(psk.constellation[arity])
-
-        # pulse shaping filter
-        nfilts = 32
-        ntaps = nfilts * 11 * int(self._samples_per_symbol)    # make nfilts filters of ntaps each
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            nfilts,          # gain
-            nfilts,          # sampling rate based on 32 filters in resampler
-            1.0,             # symbol rate
-            self._excess_bw, # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter = gr.pfb_arb_resampler_ccf(self._samples_per_symbol, self.rrc_taps)
-
-	# Connect
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-        if verbose:
-            self._print_verbage()
-            
-        if log:
-            self._setup_logging()
-            
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # static method that's also callable on an instance
-        return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def add_options(parser):
-        """
-        Adds DBPSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default]")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=True,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils2.extract_kwargs_from_options(dbpsk2_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-    def _print_verbage(self):
-        print "\nModulator:"
-        print "bits per symbol:     %d" % self.bits_per_symbol()
-        print "Gray code:           %s" % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-              
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             DBPSK demodulator
-#
-#      Differentially coherent detection of differentially encoded BPSK
-# /////////////////////////////////////////////////////////////////////////////
-
-class dbpsk2_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 freq_alpha=_def_freq_alpha,
-                 phase_alpha=_def_phase_alpha,
-                 timing_alpha=_def_timing_alpha,
-                 timing_max_dev=_def_timing_max_dev,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log,
-                 sync_out=False):
-        """
-	Hierarchical block for RRC-filtered differential BPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param freq_alpha: loop filter gain for frequency recovery
-        @type freq_alpha: float
-        @param phase_alpha: loop filter gain for phase/fine frequency recovery
-        @type phase_alpha: float
-        @param timing_alpha: loop alpha gain for timing recovery
-        @type timing_alpha: float
-        @param timing_max: timing loop maximum rate deviations
-        @type timing_max: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param log: Print modualtion data to files?
-        @type log: bool
-        @param sync_out: Output a sync signal on :1?
-        @type sync_out: bool
-	"""
-	if sync_out: io_sig_out = gr.io_signaturev(2, 2, (gr.sizeof_char, gr.sizeof_gr_complex))
-	else: io_sig_out = gr.io_signature(1, 1, gr.sizeof_char)
-
-	gr.hier_block2.__init__(self, "dqpsk2_demod",
-			        gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-			        io_sig_out)       # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._freq_alpha = freq_alpha
-        self._freq_beta = 0.10*self._freq_alpha
-        self._phase_alpha = phase_alpha
-        self._timing_alpha = timing_alpha
-        self._timing_beta = _def_timing_beta
-        self._timing_max_dev=timing_max_dev
-        self._gray_code = gray_code
-        
-        if samples_per_symbol < 2:
-            raise TypeError, "samples_per_symbol must be >= 2, is %r" % (samples_per_symbol,)
-
-        arity = pow(2,self.bits_per_symbol())
-
-        # Automatic gain control
-        self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
-        #self.agc = gr.feedforward_agc_cc(16, 1.0)
-
-        # Frequency correction
-        self.freq_recov = gr.fll_band_edge_cc(self._samples_per_symbol, self._excess_bw,
-                                              11*int(self._samples_per_symbol),
-                                              self._freq_alpha, self._freq_beta)
-
-        # symbol timing recovery with RRC data filter
-        nfilts = 32
-        ntaps = 11 * int(self._samples_per_symbol*nfilts)
-        taps = gr.firdes.root_raised_cosine(nfilts, nfilts,
-                                            1.0/float(self._samples_per_symbol),
-                                            self._excess_bw, ntaps)
-        self.time_recov = gr.pfb_clock_sync_ccf(self._samples_per_symbol,
-                                                self._timing_alpha,
-                                                taps, nfilts, nfilts/2, self._timing_max_dev)
-        self.time_recov.set_beta(self._timing_beta)
-
-        # Perform phase / fine frequency correction
-        self._phase_beta  = 0.25 * self._phase_alpha * self._phase_alpha
-        # Allow a frequency swing of +/- half of the sample rate
-        fmin = -0.5
-        fmax = 0.5
-        
-        self.phase_recov = gr.costas_loop_cc(self._phase_alpha,
-                                             self._phase_beta,
-                                             fmax, fmin, arity)
-
-        # Do differential decoding based on phase change of symbols
-        self.diffdec = gr.diff_phasor_cc()
-
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-
-        if log:
-            self._setup_logging()
-
-        # Connect
-        self.connect(self, self.agc,
-                     self.freq_recov, self.time_recov, self.phase_recov,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-        if sync_out: self.connect(self.time_recov, (self, 1))
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "FLL gain:            %.2e" % self._freq_alpha
-        print "Timing alpha gain:   %.2e" % self._timing_alpha
-        print "Timing beta gain:    %.2e" % self._timing_beta
-        print "Timing max dev:      %.2f" % self._timing_max_dev
-        print "Phase track alpha:   %.2e" % self._phase_alpha
-        print "Phase track beta:    %.2e" % self._phase_beta
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.freq_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_freq_recov.dat"))
-        self.connect(self.time_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_time_recov.dat"))
-        self.connect(self.phase_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_phase_recov.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                     gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-        
-    def add_options(parser):
-        """
-        Adds DBPSK demodulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--freq-alpha", type="float", default=_def_freq_alpha,
-                          help="set frequency lock loop alpha gain value [default=%default] (PSK)")
-        parser.add_option("", "--phase-alpha", type="float", default=_def_phase_alpha,
-                          help="set phase tracking loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--timing-alpha", type="float", default=_def_timing_alpha,
-                          help="set timing symbol sync loop gain alpha value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--timing-beta", type="float", default=_def_timing_beta,
-                          help="set timing symbol sync loop gain beta value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--timing-max-dev", type="float", default=_def_timing_max_dev,
-                          help="set timing symbol sync loop maximum deviation [default=%default] (GMSK/PSK)")
-    add_options=staticmethod(add_options)
-    
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils2.extract_kwargs_from_options(
-                 dbpsk2_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-#
-# Add these to the mod/demod registry
-#
-modulation_utils2.add_type_1_mod('dbpsk2', dbpsk2_mod)
-modulation_utils2.add_type_1_demod('dbpsk2', dbpsk2_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
deleted file mode 100644
index 42d534168..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
+++ /dev/null
@@ -1,363 +0,0 @@
-#
-# Copyright 2005,2006,2007,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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential QPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = 0.15
-_def_gain_mu = None
-_def_mu = 0.5
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           DQPSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class dqpsk_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dqpsk_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2,self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = .707 + .707j
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol, # gain  (sps since we're interpolating by sps)
-            self._samples_per_symbol, # sampling rate
-            1.0,		      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect & Initialize base class
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 2
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nModulator:"
-        print "bits per symbol:     %d" % self.bits_per_symbol()
-        print "Gray code:           %s" % self._gray_code
-        print "RRS roll-off factor: %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds QPSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(dqpsk_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           DQPSK demodulator
-#
-# Differentially coherent detection of differentially encoded qpsk
-# /////////////////////////////////////////////////////////////////////////////
-
-class dqpsk_demod(gr.hier_block2):
-
-    def __init__(self, 
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered DQPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param costas_alpha: loop filter gain
-        @type costas_alphas: float
-        @param gain_mu: for M&M block
-        @type gain_mu: float
-        @param mu: for M&M block
-        @type mu: float
-        @param omega_relative_limit: for M&M block
-        @type omega_relative_limit: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dqpsk_demod",
-			        gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-			        gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._costas_alpha = costas_alpha
-        self._mm_gain_mu = gain_mu
-        self._mm_mu = mu
-        self._mm_omega_relative_limit = omega_relative_limit
-        self._gray_code = gray_code
-
-        if samples_per_symbol < 2:
-            raise TypeError, "sbp must be >= 2, is %d" % samples_per_symbol
-
-        arity = pow(2,self.bits_per_symbol())
- 
-        # Automatic gain control
-        scale = (1.0/16384.0)
-        self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal from full-range to +-1
-        #self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
-        self.agc = gr.feedforward_agc_cc(16, 2.0)
-       
-        # RRC data filter
-        ntaps = 11 * samples_per_symbol
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            1.0,                      # gain
-            self._samples_per_symbol, # sampling rate
-            1.0,                      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
-
-        if not self._mm_gain_mu:
-            sbs_to_mm = {2: 0.050, 3: 0.075, 4: 0.11, 5: 0.125, 6: 0.15, 7: 0.15}
-            self._mm_gain_mu = sbs_to_mm[samples_per_symbol]
-
-        self._mm_omega = self._samples_per_symbol
-        self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
-        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.25
-        fmax = 0.25
-        
-        self.receiver=gr.mpsk_receiver_cc(arity, pi/4.0,
-                                          self._costas_alpha, self._costas_beta,
-                                          fmin, fmax,
-                                          self._mm_mu, self._mm_gain_mu,
-                                          self._mm_omega, self._mm_gain_omega,
-                                          self._mm_omega_relative_limit)
-        
-        # Perform Differential decoding on the constellation
-        self.diffdec = gr.diff_phasor_cc()
-        
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
- 
-        # Connect & Initialize base class
-        self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 2
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "Costas Loop alpha:   %.2e" % self._costas_alpha
-        print "Costas Loop beta:    %.2e" % self._costas_beta
-        print "M&M mu:              %.2f" % self._mm_mu
-        print "M&M mu gain:         %.2e" % self._mm_gain_mu
-        print "M&M omega:           %.2f" % self._mm_omega
-        print "M&M omega gain:      %.2e" % self._mm_gain_omega
-        print "M&M omega limit:     %.2f" % self._mm_omega_relative_limit
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.pre_scaler,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.connect(self.receiver,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                     gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_gray_decoder.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-    def add_options(parser):
-        """
-        Adds modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", default=_def_costas_alpha,
-                          help="set Costas loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
-                          help="set M&M symbol sync loop gain mu value [default=%default] (PSK)")
-        parser.add_option("", "--mu", type="float", default=_def_mu,
-                          help="set M&M symbol sync loop mu value [default=%default] (PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(
-            dqpsk_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-#
-# Add these to the mod/demod registry
-#
-modulation_utils.add_type_1_mod('dqpsk', dqpsk_mod)
-modulation_utils.add_type_1_demod('dqpsk', dqpsk_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py
deleted file mode 100644
index e1e627707..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py
+++ /dev/null
@@ -1,377 +0,0 @@
-#
-# Copyright 2009,2010 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential QPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils2
-from math import pi, sqrt
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_freq_alpha = 0.010
-_def_phase_alpha = 0.01
-_def_timing_alpha = 0.100
-_def_timing_beta = 0.010
-_def_timing_max_dev = 1.5
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           DQPSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class dqpsk2_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dqpsk2_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if samples_per_symbol < 2:
-            raise TypeError, ("sbp must be >= 2, is %f" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2,self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = .707 + .707j
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-        nfilts = 32
-        ntaps = 11 * int(nfilts * self._samples_per_symbol)  # make nfilts filters of ntaps each
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            nfilts,          # gain
-            nfilts,          # sampling rate based on 32 filters in resampler
-            1.0,             # symbol rate
-            self._excess_bw, # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter = gr.pfb_arb_resampler_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect & Initialize base class
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 2
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nModulator:"
-        print "bits per symbol:     %d" % self.bits_per_symbol()
-        print "Gray code:           %s" % self._gray_code
-        print "RRS roll-off factor: %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds QPSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils2.extract_kwargs_from_options(dqpsk2_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           DQPSK demodulator
-#
-# Differentially coherent detection of differentially encoded qpsk
-# /////////////////////////////////////////////////////////////////////////////
-
-class dqpsk2_demod(gr.hier_block2):
-
-    def __init__(self, 
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 freq_alpha=_def_freq_alpha,
-                 phase_alpha=_def_phase_alpha,
-                 timing_alpha=_def_timing_alpha,
-                 timing_max_dev=_def_timing_max_dev,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log,
-                 sync_out=False):
-        """
-	Hierarchical block for RRC-filtered DQPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param freq_alpha: loop filter gain for frequency recovery
-        @type freq_alpha: float
-        @param phase_alpha: loop filter gain
-        @type phase_alphas: float
-        @param timing_alpha: timing loop alpha gain
-        @type timing_alpha: float
-        @param timing_max: timing loop maximum rate deviations
-        @type timing_max: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param log: Print modualtion data to files?
-        @type log: bool
-        @param sync_out: Output a sync signal on :1?
-        @type sync_out: bool
-	"""
-	if sync_out: io_sig_out = gr.io_signaturev(2, 2, (gr.sizeof_char, gr.sizeof_gr_complex))
-	else: io_sig_out = gr.io_signature(1, 1, gr.sizeof_char)
-
-	gr.hier_block2.__init__(self, "dqpsk2_demod",
-			        gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-			        io_sig_out)       # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._freq_alpha = freq_alpha
-        self._freq_beta = 0.25*self._freq_alpha**2
-        self._phase_alpha = phase_alpha
-        self._timing_alpha = timing_alpha
-        self._timing_beta = _def_timing_beta
-        self._timing_max_dev=timing_max_dev
-        self._gray_code = gray_code
-
-        if samples_per_symbol < 2:
-            raise TypeError, "sbp must be >= 2, is %d" % samples_per_symbol
-
-        arity = pow(2,self.bits_per_symbol())
- 
-        # Automatic gain control
-        self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
-        #self.agc = gr.feedforward_agc_cc(16, 2.0)
-
-        # Frequency correction
-        self.freq_recov = gr.fll_band_edge_cc(self._samples_per_symbol, self._excess_bw,
-                                              11*int(self._samples_per_symbol),
-                                              self._freq_alpha, self._freq_beta)
-
-
-        # symbol timing recovery with RRC data filter
-        nfilts = 32
-        ntaps = 11 * int(samples_per_symbol*nfilts)
-        taps = gr.firdes.root_raised_cosine(nfilts, nfilts,
-                                            1.0/float(self._samples_per_symbol),
-                                            self._excess_bw, ntaps)
-        self.time_recov = gr.pfb_clock_sync_ccf(self._samples_per_symbol,
-                                                self._timing_alpha,
-                                                taps, nfilts, nfilts/2, self._timing_max_dev)
-        self.time_recov.set_beta(self._timing_beta)
-        
-
-        # Perform phase / fine frequency correction
-        self._phase_beta  = 0.25 * self._phase_alpha * self._phase_alpha
-        # Allow a frequency swing of +/- half of the sample rate
-        fmin = -0.5
-        fmax = 0.5
-
-        self.phase_recov = gr.costas_loop_cc(self._phase_alpha,
-                                             self._phase_beta,
-                                             fmax, fmin, arity)
-
-
-        # Perform Differential decoding on the constellation
-        self.diffdec = gr.diff_phasor_cc()
-        
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
- 
-        # Connect
-        self.connect(self, self.agc, 
-                     self.freq_recov, self.time_recov, self.phase_recov,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-        if sync_out: self.connect(self.time_recov, (self, 1))
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 2
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "FLL gain:            %.2f" % self._freq_alpha
-        print "Timing alpha gain:   %.2f" % self._timing_alpha
-        print "Timing beta gain:    %.2f" % self._timing_beta
-        print "Timing max dev:      %.2f" % self._timing_max_dev
-        print "Phase track alpha:   %.2e" % self._phase_alpha
-        print "Phase track beta:    %.2e" % self._phase_beta
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.freq_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_freq_recov.dat"))
-        self.connect(self.time_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_time_recov.dat"))
-        self.connect(self.phase_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_phase_recov.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                     gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_gray_decoder.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-    def add_options(parser):
-        """
-        Adds DQPSK demodulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--freq-alpha", type="float", default=_def_freq_alpha,
-                          help="set frequency lock loop alpha gain value [default=%default] (PSK)")
-        parser.add_option("", "--phase-alpha", type="float", default=_def_phase_alpha,
-                          help="set phase tracking loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--timing-alpha", type="float", default=_def_timing_alpha,
-                          help="set timing symbol sync loop gain alpha value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--timing-beta", type="float", default=_def_timing_beta,
-                          help="set timing symbol sync loop gain beta value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--timing-max-dev", type="float", default=_def_timing_max_dev,
-                          help="set timing symbol sync loop maximum deviation [default=%default] (GMSK/PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils2.extract_kwargs_from_options(
-            dqpsk2_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-#
-# Add these to the mod/demod registry
-#
-modulation_utils2.add_type_1_mod('dqpsk2', dqpsk2_mod)
-modulation_utils2.add_type_1_demod('dqpsk2', dqpsk2_demod)
diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
index 45c970227..e1c79ab4f 100644
--- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
@@ -51,7 +51,6 @@ noinst_PYTHON = 			\
 	qa_classify.py			\
 	qa_cma_equalizer.py		\
 	qa_complex_to_xxx.py		\
-	qa_constellation_decoder_cb.py  \
 	qa_copy.py			\
 	qa_correlate_access_code.py	\
 	qa_delay.py			\
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
index 4f67614d8..493daab8b 100644
--- a/gr-digital/lib/Makefile.am
+++ b/gr-digital/lib/Makefile.am
@@ -25,6 +25,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = 				\
+	digital_binary_slicer_fb.h		\
 	digital_constellation.h			\
 	digital_constellation_receiver_cb.h 	\
 	digital_constellation_decoder_cb.h 	\
@@ -37,6 +38,7 @@ grinclude_HEADERS = 				\
 lib_LTLIBRARIES = libgnuradio-digital.la
 
 libgnuradio_digital_la_SOURCES = 		\
+	digital_binary_slicer_fb.cc		\
 	digital_constellation.cc		\
 	digital_constellation_receiver_cb.cc	\
 	digital_constellation_decoder_cb.cc	\
diff --git a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.cc b/gr-digital/lib/digital_binary_slicer_fb.cc
index ae8903abb..fcdb4291f 100644
--- a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.cc
+++ b/gr-digital/lib/digital_binary_slicer_fb.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2010 Free Software Foundation, Inc.
+ * Copyright 2006,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,40 +24,35 @@
 #include "config.h"
 #endif
 
-#include <gr_binary_slicer_fb.h>
+#include <digital_binary_slicer_fb.h>
 #include <gr_io_signature.h>
+#include <gr_math.h>
 #include <stdexcept>
 
-gr_binary_slicer_fb_sptr
-gr_make_binary_slicer_fb ()
+digital_binary_slicer_fb_sptr
+digital_make_binary_slicer_fb ()
 {
-  return gnuradio::get_initial_sptr(new gr_binary_slicer_fb ());
+  return gnuradio::get_initial_sptr(new digital_binary_slicer_fb ());
 }
 
-gr_binary_slicer_fb::gr_binary_slicer_fb ()
+digital_binary_slicer_fb::digital_binary_slicer_fb ()
   : gr_sync_block ("binary_slicer_fb",
 		   gr_make_io_signature (1, 1, sizeof (float)),
 		   gr_make_io_signature (1, 1, sizeof (unsigned char)))
 {
 }
 
-static inline int
-slice(float x)
-{
-  return x < 0 ? 0 : 1;
-}
-
 int
-gr_binary_slicer_fb::work (int noutput_items,
-			   gr_vector_const_void_star &input_items,
-			   gr_vector_void_star &output_items)
+digital_binary_slicer_fb::work (int noutput_items,
+				gr_vector_const_void_star &input_items,
+				gr_vector_void_star &output_items)
 {
   const float *in = (const float *) input_items[0];
   unsigned char *out = (unsigned char *) output_items[0];
 
 
   for (int i = 0; i < noutput_items; i++){
-    out[i] = slice(in[i]);
+    out[i] = gr_binary_slicer(in[i]);
   }
   
   return noutput_items;
diff --git a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.h b/gr-digital/lib/digital_binary_slicer_fb.h
index 2aa4a0828..2d10484db 100644
--- a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.h
+++ b/gr-digital/lib/digital_binary_slicer_fb.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,15 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_BINARY_SLICER_FB_H
-#define INCLUDED_GR_BINARY_SLICER_FB_H
+#ifndef INCLUDED_DIGITAL_BINARY_SLICER_FB_H
+#define INCLUDED_DIGITAL_BINARY_SLICER_FB_H
 
 #include <gr_sync_block.h>
 
-class gr_binary_slicer_fb;
-typedef boost::shared_ptr<gr_binary_slicer_fb> gr_binary_slicer_fb_sptr;
+class digital_binary_slicer_fb;
+typedef boost::shared_ptr<digital_binary_slicer_fb> digital_binary_slicer_fb_sptr;
 
-gr_binary_slicer_fb_sptr gr_make_binary_slicer_fb ();
+digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
 
 /*!
  * \brief slice float binary symbol outputting 1 bit output
@@ -37,10 +37,10 @@ gr_binary_slicer_fb_sptr gr_make_binary_slicer_fb ();
  * x <  0 --> 0
  * x >= 0 --> 1
  */
-class gr_binary_slicer_fb : public gr_sync_block
+class digital_binary_slicer_fb : public gr_sync_block
 {
-  friend gr_binary_slicer_fb_sptr gr_make_binary_slicer_fb ();
-  gr_binary_slicer_fb ();
+  friend digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
+  digital_binary_slicer_fb ();
 
  public:
   int work (int noutput_items,
diff --git a/gr-digital/python/Makefile.am b/gr-digital/python/Makefile.am
index f0bfbc28f..49271fa18 100644
--- a/gr-digital/python/Makefile.am
+++ b/gr-digital/python/Makefile.am
@@ -32,8 +32,10 @@ digitaldir = $(grpythondir)/digital
 
 noinst_PYTHON = \
 	qa_digital.py			\
+	qa_binary_slicer_fb.py		\
 	qa_constellation.py		\
 	qa_constellation_receiver.py	\
+	qa_constellation_decoder_cb.py	\
 	qa_costas_loop_cc.py
 
 digital_PYTHON = \
@@ -46,5 +48,6 @@ digital_PYTHON = \
 	generic_mod_demod.py	\
 	qam.py		\
 	bpsk.py		\
-	qpsk.py
+	qpsk.py		\
+	gmsk.py
 endif
diff --git a/gr-digital/python/dbpsk.py b/gr-digital/python/dbpsk.py
index 2e9b756e6..21ca0474b 100644
--- a/gr-digital/python/dbpsk.py
+++ b/gr-digital/python/dbpsk.py
@@ -274,7 +274,7 @@ class dbpsk_demod(gr.hier_block2):
         # find closest constellation point
         rot = 1
         rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
+        self.slicer = digital.constellation_decoder_cb(rotated_const, range(arity))
 
         if self._gray_code:
             self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/gmsk.py b/gr-digital/python/gmsk.py
index 3b6c016a0..3b6c016a0 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/gmsk.py
+++ b/gr-digital/python/gmsk.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_constellation_decoder_cb.py b/gr-digital/python/qa_binary_slicer_fb.py
index 27e1802e0..944dc1b5a 100755..100644
--- a/gnuradio-core/src/python/gnuradio/gr/qa_constellation_decoder_cb.py
+++ b/gr-digital/python/qa_binary_slicer_fb.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2007,2010 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,8 @@
 # 
 
 from gnuradio import gr, gr_unittest
-import math
+import digital_swig
+import math, random
 
 class test_constellation_decoder (gr_unittest.TestCase):
 
@@ -31,17 +32,18 @@ class test_constellation_decoder (gr_unittest.TestCase):
     def tearDown (self):
         self.tb = None
 
-    def test_constellation_decoder_cb (self):
-        symbol_positions  = [1 + 0j, 0 + 1j , -1 + 0j, 0 - 1j]
-        symbol_values_out = [0, 1, 2, 3]
-	expected_result = (       0,          3,           2,            1,        0,       0,          3)
-  	src_data =        (0.5 + 0j, 0.1 - 1.2j, -0.8 - 0.1j, -0.45 + 0.8j, 0.8 - 0j, 0.5 + 0j, 0.1 - 1.2j)
-        src = gr.vector_source_c (src_data)
-        op = gr.constellation_decoder_cb (symbol_positions, symbol_values_out)
+    def test_binary_slicer_fb (self):
+	expected_result = ( 0, 1,  0,  0, 1, 1,  0,  0,  0, 1, 1, 1,  0, 1, 1, 1, 1)
+  	src_data =        (-1, 1, -1, -1, 1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, 1)
+        src_data = [s + (1 - random.random()) for s in src_data] # add some noise
+        src = gr.vector_source_f (src_data)
+        op = digital_swig.binary_slicer_fb ()
         dst = gr.vector_sink_b ()
+
         self.tb.connect (src, op)
         self.tb.connect (op, dst)
         self.tb.run ()               # run the graph and wait for it to finish
+
         actual_result = dst.data ()  # fetch the contents of the sink
 	#print "actual result", actual_result
 	#print "expected result", expected_result
diff --git a/gr-digital/python/qa_constellation_decoder_cb.py b/gr-digital/python/qa_constellation_decoder_cb.py
new file mode 100755
index 000000000..5401a07fc
--- /dev/null
+++ b/gr-digital/python/qa_constellation_decoder_cb.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2007,2010,2011 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, gr_unittest
+import digital_swig
+import math
+
+class test_constellation_decoder (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test_constellation_decoder_cb_bpsk (self):
+        cnst = digital_swig.constellation_bpsk()
+  	src_data =        (0.5 + 0.5j,  0.1 - 1.2j, -0.8 - 0.1j, -0.45 + 0.8j,
+                           0.8 + 1.0j, -0.5 + 0.1j,  0.1 - 1.2j)
+	expected_result = (        1,           1,           0,            0,
+                                   1,           0,           1)
+        src = gr.vector_source_c (src_data)
+        op = digital_swig.constellation_decoder_cb (cnst.base())
+        dst = gr.vector_sink_b ()
+
+        self.tb.connect (src, op)
+        self.tb.connect (op, dst)
+        self.tb.run ()               # run the graph and wait for it to finish
+
+        actual_result = dst.data ()  # fetch the contents of the sink
+	#print "actual result", actual_result
+	#print "expected result", expected_result
+        self.assertFloatTuplesAlmostEqual (expected_result, actual_result)
+
+    def test_constellation_decoder_cb_qpsk (self):
+        cnst = digital_swig.constellation_qpsk()
+  	src_data =        (0.5 + 0.5j,  0.1 - 1.2j, -0.8 - 0.1j, -0.45 + 0.8j,
+                           0.8 + 1.0j, -0.5 + 0.1j,  0.1 - 1.2j)
+	expected_result = (        3,           1,           0,            2,
+                                   3,           2,           1)
+        src = gr.vector_source_c (src_data)
+        op = digital_swig.constellation_decoder_cb (cnst.base())
+        dst = gr.vector_sink_b ()
+
+        self.tb.connect (src, op)
+        self.tb.connect (op, dst)
+        self.tb.run ()               # run the graph and wait for it to finish
+
+        actual_result = dst.data ()  # fetch the contents of the sink
+	#print "actual result", actual_result
+	#print "expected result", expected_result
+        self.assertFloatTuplesAlmostEqual (expected_result, actual_result)
+
+
+if __name__ == '__main__':
+    gr_unittest.run(test_constellation_decoder, "test_constellation_decoder.xml")
+
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
index b9ebf4cc5..f1041ab69 100644
--- a/gr-digital/swig/Makefile.am
+++ b/gr-digital/swig/Makefile.am
@@ -58,6 +58,7 @@ digital_swig_la_swig_libadd = \
 
 # additional SWIG files to be installed
 digital_swig_swiginclude_headers =		\
+	digital_binary_slicer_fb.i		\
 	digital_constellation.i			\
 	digital_constellation_receiver_cb.i 	\
 	digital_constellation_decoder_cb.i	\
diff --git a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.i b/gr-digital/swig/digital_binary_slicer_fb.i
index b6f4e9312..30603748b 100644
--- a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.i
+++ b/gr-digital/swig/digital_binary_slicer_fb.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,14 +20,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,binary_slicer_fb);
+GR_SWIG_BLOCK_MAGIC(digital,binary_slicer_fb);
 
-gr_binary_slicer_fb_sptr gr_make_binary_slicer_fb ();
+digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
 
-class gr_binary_slicer_fb : public gr_sync_block
+class digital_binary_slicer_fb : public gr_sync_block
 {
  private:
-  gr_binary_slicer_fb ();
+  digital_binary_slicer_fb ();
 
  public:
 };
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index 26a9dd130..dd4f3c02c 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -22,6 +22,7 @@
 %include "gnuradio.i"
 
 %{
+#include "digital_binary_slicer_fb.h"
 #include "digital_constellation.h"
 #include "digital_costas_loop_cc.h"
 #include "digital_cma_equalizer_cc.h"
@@ -31,6 +32,7 @@
 #include "digital_constellation_decoder_cb.h"
 %}
 
+%include "digital_binary_slicer_fb.i"
 %include "digital_constellation.i"
 %include "digital_costas_loop_cc.i"
 %include "digital_cma_equalizer_cc.i"