diff --git a/Phys/Tesla/python/Tesla/Configuration.py b/Phys/Tesla/python/Tesla/Configuration.py index 7e1680512846e866e3aca7bc66232e0c03654258..4e75c123b057bdfbae319301487b75316f38eeef 100644 --- a/Phys/Tesla/python/Tesla/Configuration.py +++ b/Phys/Tesla/python/Tesla/Configuration.py @@ -779,16 +779,6 @@ class Tesla(LHCbConfigurableUser): packed_data_decoder = HltPackedDataDecoder('Hlt2PackedDataDecoder') decoders_seq.Members.append(packed_data_decoder) - # Decode the RecSummary from the SelReports to /Event/Rec/Summary - recsummary_decoder = RecSummaryFromSelReports() - recsummary_decoder.InputHltSelReportsLocation = 'Hlt2/SelReports' - decoders_seq.Members.append(GaudiSequencer( - 'RecSummarySeq', Members=[ - self._selReportsCheck(), - recsummary_decoder, - ] - )) - prpacking = PersistRecoConf.PersistRecoPacking(datatype) prunpackers = prpacking.unpackers() @@ -888,6 +878,23 @@ class Tesla(LHCbConfigurableUser): if output_prefix or self.getProp('HDRFilter'): stream_seq.Members.append(filter) + tes_root = '/Event' + # /Event/<stream name> + stream_base = os.path.join(tes_root, output_prefix).rstrip('/') + # /Event/<stream name>/Turbo + turbo_base = os.path.join(stream_base, 'Turbo') + + # Decode the RecSummary from the SelReports + recsummary_decoder = RecSummaryFromSelReports(namer('RecSummaryFromSelReports')) + recsummary_decoder.InputHltSelReportsLocation = 'Hlt2/SelReports' + recsummary_decoder.OutputRecSummaryLocation = os.path.join(turbo_base, 'Rec/Summary') + stream_seq.Members.append(GaudiSequencer( + namer('RecSummarySeq'), Members=[ + self._selReportsCheck(), + recsummary_decoder + ] + )) + # No need to clone if the output prefix is empty (everything stays # under /Event/Turbo) if output_prefix: @@ -919,13 +926,8 @@ class Tesla(LHCbConfigurableUser): ) stream_seq.Members.append(copy_line_outputs_seq) - tes_root = '/Event' - # /Event/<stream name> - stream_base = os.path.join(tes_root, output_prefix).rstrip('/') - # /Event/<stream name>/Turbo - turbo_base = os.path.join(stream_base, 'Turbo') required_output_locations = [ - os.path.join(tes_root, 'Rec/Summary#1') + str(recsummary_decoder.OutputRecSummaryLocation) + '#1' ] optional_output_locations = [] if pack: