Commit 5bff25c3 authored by Rosen Matev's avatar Rosen Matev
Browse files

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
parents f6cbd5e5 176543ec
Pipeline #3164440 passed with stage
in 16 seconds
...@@ -15,13 +15,14 @@ from PyConf.control_flow import CompositeNode, NodeLogic ...@@ -15,13 +15,14 @@ from PyConf.control_flow import CompositeNode, NodeLogic
from PyConf.application import make_odin from PyConf.application import make_odin
from Moore.config import (moore_control_flow, setup_ann_service, from Moore.config import (moore_control_flow, setup_ann_service,
get_allen_hlt1_decision_ids) get_allen_hlt1_decision_ids)
from PyConf.Algorithms import MCDecayTreeTuple, EventTuple, AllenSelReportsToTES, HltSelReportsDecoder from PyConf.Algorithms import MCDecayTreeTuple, EventTuple
from Configurables import (TupleToolTrigger, TupleToolEventInfo, from Configurables import (TupleToolTrigger, TupleToolEventInfo,
MCTupleToolKinematic, MCTupleToolReconstructed, MCTupleToolKinematic, MCTupleToolReconstructed,
MCTupleToolTOSHLT1, MCTupleToolTOSHLT2) MCTupleToolTOSHLT1, MCTupleToolTOSHLT2)
from RecoConf.mc_checking import make_links_lhcbids_mcparticles_tracking_system 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.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): def _mc_decay_tree_tuple_input_transform(MCParticles, MCVertices, MCTrackInfo):
...@@ -104,11 +105,7 @@ def add_efficiency_tuples_allen(allen_node, descriptor_template=None): ...@@ -104,11 +105,7 @@ def add_efficiency_tuples_allen(allen_node, descriptor_template=None):
mcttrec = MCTupleToolReconstructed(Associate=False, FillPID=False) mcttrec = MCTupleToolReconstructed(Associate=False, FillPID=False)
# FIXME the Reconstructed flag from MCTupleToolReconstructed doesn't work yet # FIXME the Reconstructed flag from MCTupleToolReconstructed doesn't work yet
allen_wrapper = make_allen_output() sel_rep_decoder = decode_allen_sel_reports()
allen_sel_rep_writer = AllenSelReportsToTES(AllenOutput=allen_wrapper)
sel_rep_decoder = HltSelReportsDecoder(
RawEventLocations=allen_sel_rep_writer.OutputSelReports,
SourceID='Hlt1')
sel_rep_loc = sel_rep_decoder.OutputHltSelReportsLocation.location sel_rep_loc = sel_rep_decoder.OutputHltSelReportsLocation.location
mctttos = MCTupleToolTOSHLT1( mctttos = MCTupleToolTOSHLT1(
'MCDecayTreeTuple.MCTupleToolTOSHLT1', 'MCDecayTreeTuple.MCTupleToolTOSHLT1',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment