diff options
Diffstat (limited to 'gr-fec/python/fec/extended_decoder.py')
| -rw-r--r-- | gr-fec/python/fec/extended_decoder.py | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/gr-fec/python/fec/extended_decoder.py b/gr-fec/python/fec/extended_decoder.py index 792d7dfeb3..7e6cf452f9 100644 --- a/gr-fec/python/fec/extended_decoder.py +++ b/gr-fec/python/fec/extended_decoder.py @@ -82,7 +82,7 @@ class extended_decoder(gr.hier_block2): } def __init__(self, decoder_obj_list, threading, ann=None, puncpat='11', - integration_period=10000, flush=None, rotator=None, lentagname=None): + integration_period=10000, flush=None, rotator=None): gr.hier_block2.__init__(self, "extended_decoder", gr.io_signature(1, 1, gr.sizeof_float), gr.io_signature(1, 1, gr.sizeof_char)) @@ -91,17 +91,13 @@ class extended_decoder(gr.hier_block2): self.puncpat=puncpat self.flush=flush - if(type(decoder_obj_list[0]) == list): - gr.log.info("fec.extended_decoder: Parallelism must be 1.") - raise AttributeError - - if type(lentagname) == str: - if(lentagname.lower() == 'none'): - lentagname = None - - if lentagname and threading: - gr.log.info("fec.extended_decoder: Cannot use threading with tagged_stream mode.") - raise AttributeError + if(type(decoder_obj_list) == list): + if(type(decoder_obj_list[0]) == list): + gr.log.info("fec.extended_decoder: Parallelism must be 1.") + raise AttributeError + else: + # If it has parallelism of 0, force it into a list of 1 + decoder_obj_list = [decoder_obj_list,] message_collector_connected=False @@ -136,10 +132,10 @@ class extended_decoder(gr.hier_block2): for i in idx_list: if 1.0/self.ann.count('1') >= i: synd_garble = self.garbletable[i] - print 'using syndrom garble threshold ' + str(synd_garble) + 'for corr_bb' + print 'using syndrom garble threshold ' + str(synd_garble) + 'for conv_bit_corr_bb' print 'ceiling: .0335 data garble rate' - self.blocks.append(fec.corr_bb(cat, len(puncpat) - puncpat.count('0'), - len(ann), integration_period, flush, synd_garble)) + self.blocks.append(fec.conv_bit_corr_bb(cat, len(puncpat) - puncpat.count('0'), + len(ann), integration_period, flush, synd_garble)) if self.puncpat != '11': self.blocks.append(fec.depuncture_bb(len(puncpat), read_bitlist(puncpat), 0)) @@ -166,15 +162,9 @@ class extended_decoder(gr.hier_block2): fec.get_decoder_output_item_size(decoder_obj_list[0]))) else: - if(not lentagname): - self.blocks.append(fec.decoder(decoder_obj_list[0], - fec.get_decoder_input_item_size(decoder_obj_list[0]), - fec.get_decoder_output_item_size(decoder_obj_list[0]))) - else: - self.blocks.append(fec.tagged_decoder(decoder_obj_list[0], - fec.get_decoder_input_item_size(decoder_obj_list[0]), - fec.get_decoder_output_item_size(decoder_obj_list[0]), - lentagname)) + self.blocks.append(fec.decoder(decoder_obj_list[0], + fec.get_decoder_input_item_size(decoder_obj_list[0]), + fec.get_decoder_output_item_size(decoder_obj_list[0]))) if fec.get_decoder_output_conversion(decoder_obj_list[0]) == "unpack": self.blocks.append(blocks.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST)); |