Skip to content
Snippets Groups Projects
Commit 6c09bfb7 authored by Francisco Javier Sanchez Martinez's avatar Francisco Javier Sanchez Martinez Committed by Graeme Stewart
Browse files

Tagging the 00.02.12 release (EventIndexProducer-00-02-12)

parent 01d6ea51
No related branches found
Tags 1.6.2
No related merge requests found
......@@ -146,9 +146,9 @@ class POOL2EI(PyAthena.Alg):
self.trigDec = PyAthena.py_tool('Trig::TrigDecisionTool/TrigDecisionTool')
self.trigDec.ExperimentalAndExpertMethods().enable()
if self.HaveXHlt:
self.trigDec.setProperty("TrigDecisionKey","xTrigDecision");
self.trigDec.setProperty("TrigDecisionKey","xTrigDecision")
else:
self.trigDec.setProperty("TrigDecisionKey","TrigDecision");
self.trigDec.setProperty("TrigDecisionKey","TrigDecision")
else:
if self.HaveHlt:
_info("Switch HaveHlt to False")
......@@ -619,7 +619,7 @@ class POOL2EI(PyAthena.Alg):
eirec['EFPassedTrigMask'] = trigEF
## form Metadata
## from Metadata
SMK = self._iov.get('SMK',(run_number,event_number))
L1PSK = self._iov.get('L1PSK',(run_number,lumi_block))
HLTPSK = self._iov.get('HLTPSK',(run_number,lumi_block))
......
......@@ -149,14 +149,16 @@ except:
if inputFileSummary.has_key('metadata') and inputFileSummary['metadata'].has_key('/TRIGGER/HLT/HltConfigKeys'):
# we should search for 'xAOD::TrigDecision' in eventdata_items but 'zero events' files do not
# contain eventdata_items, so we look for 'xAOD::TriggerMenuContainer' in metadata_items instead
# we should search for 'xAOD::TrigDecision' in eventdata_items but 'zero events' files do not
# contain eventdata_items, so we look also for 'xAOD::TriggerMenuContainer' in metadata_items
job.pool2ei.HaveXHlt = False
if inputFileSummary.has_key('eventdata_items') and 'xAOD::TrigDecision' \
in [ x[0] for x in inputFileSummary['eventdata_items'] ]:
job.pool2ei.HaveXHlt = True
if inputFileSummary.has_key('metadata_items') and 'xAOD::TriggerMenuContainer' \
in [ x[0] for x in inputFileSummary['metadata_items'] ]:
job.pool2ei.HaveXHlt = True
else:
job.pool2ei.HaveXHlt = False
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
cfg = TriggerConfigGetter("ReadPool")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment