Merge branch 'spradlin-alt_t_together_reports' into 'master'

Update HltEfficiencyChecker configuration to be consisitent with RecoConf/hlt1_allen.py update

See merge request !57

HltEfficiencyChecker/python/HltEfficiencyChecker/config.py

@@ -15,13 +15,14 @@ from PyConf.control_flow import CompositeNode, NodeLogic
 from PyConf.application import make_odin
 from Moore.config import (moore_control_flow, setup_ann_service,
                           get_allen_hlt1_decision_ids)
-from PyConf.Algorithms import MCDecayTreeTuple, EventTuple, AllenSelReportsToTES, HltSelReportsDecoder
+from PyConf.Algorithms import MCDecayTreeTuple, EventTuple
 from Configurables import (TupleToolTrigger, TupleToolEventInfo,
                            MCTupleToolKinematic, MCTupleToolReconstructed,
                            MCTupleToolTOSHLT1, MCTupleToolTOSHLT2)
 from RecoConf.mc_checking import make_links_lhcbids_mcparticles_tracking_system
 from RecoConf.data_from_file import mc_unpackers, make_mc_track_info
-from RecoConf.hlt1_allen import make_allen_dec_reports, make_allen_output
+from RecoConf.hlt1_allen import (make_allen_dec_reports,
+                                 decode_allen_sel_reports)
 
 
 def _mc_decay_tree_tuple_input_transform(MCParticles, MCVertices, MCTrackInfo):
@@ -104,11 +105,7 @@ def add_efficiency_tuples_allen(allen_node, descriptor_template=None):
         mcttrec = MCTupleToolReconstructed(Associate=False, FillPID=False)
         # FIXME the Reconstructed flag from MCTupleToolReconstructed doesn't work yet
 
-        allen_wrapper = make_allen_output()
-        allen_sel_rep_writer = AllenSelReportsToTES(AllenOutput=allen_wrapper)
-        sel_rep_decoder = HltSelReportsDecoder(
-            RawEventLocations=allen_sel_rep_writer.OutputSelReports,
-            SourceID='Hlt1')
+        sel_rep_decoder = decode_allen_sel_reports()
         sel_rep_loc = sel_rep_decoder.OutputHltSelReportsLocation.location
         mctttos = MCTupleToolTOSHLT1(
             'MCDecayTreeTuple.MCTupleToolTOSHLT1',