From 9061dcdfa859ff58fe634bf4720c85cead95dcdf Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Sun, 9 Dec 2018 23:25:34 +0000
Subject: [PATCH] Merge branch 'fixRun1TriggerDecoding' into '21.0'
ATR-18864 Add missing configuration for reconstruction of Run-1 bytestream.
See merge request atlas/athena!15893
(cherry picked from commit c6efdd80197970b9f82f01dbb8ab8307d96f342f [formerly 6f437cc6e922e53e34c9a59a8e763caea9cc7eba])
5fd34ba4 Add missing configuration for reconstruction of Run-1 bytestream.
Former-commit-id: 0775c077d9b727460a0d13a3bad3b6ebded96c25
---
.../TriggerJobOpts/python/HLTTriggerResultGetter.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
index 1cfcdb22804..a73acaaa262 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
@@ -39,6 +39,7 @@ def EDMDecodingVersion():
#Run1 data
if runNumber > 0 and runNumber < 230000 :
TriggerFlags.EDMDecodingVersion = 1
+ TriggerFlags.doMergedHLTResult = False
log.info("decoding version set to 1, because running on BS file from Run1")
pass
else:
@@ -49,9 +50,11 @@ def EDMDecodingVersion():
if cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_EF" ):
TriggerFlags.EDMDecodingVersion = 1
+ TriggerFlags.doMergedHLTResult = False
log.info("Decoding version set to 1, because HLTResult_EF found in pool file")
elif cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_HLT"):
TriggerFlags.EDMDecodingVersion = 2
+ TriggerFlags.doMergedHLTResult = True
else:
log.warning("No HLTResult found in pool file")
pass
--
GitLab