Commit c6efdd80 authored by James Beacham's avatar James Beacham
Browse files

Merge branch 'fixRun1TriggerDecoding' into '21.0'

ATR-18864 Add missing configuration for reconstruction of Run-1 bytestream.

See merge request atlas/athena!15893

Former-commit-id: 6f437cc6e922e53e34c9a59a8e763caea9cc7eba
parents 1a538e70 1a9f4afe
...@@ -39,6 +39,7 @@ def EDMDecodingVersion(): ...@@ -39,6 +39,7 @@ def EDMDecodingVersion():
#Run1 data #Run1 data
if runNumber > 0 and runNumber < 230000 : if runNumber > 0 and runNumber < 230000 :
TriggerFlags.EDMDecodingVersion = 1 TriggerFlags.EDMDecodingVersion = 1
TriggerFlags.doMergedHLTResult = False
log.info("decoding version set to 1, because running on BS file from Run1") log.info("decoding version set to 1, because running on BS file from Run1")
pass pass
else: else:
...@@ -49,9 +50,11 @@ def EDMDecodingVersion(): ...@@ -49,9 +50,11 @@ def EDMDecodingVersion():
if cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_EF" ): if cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_EF" ):
TriggerFlags.EDMDecodingVersion = 1 TriggerFlags.EDMDecodingVersion = 1
TriggerFlags.doMergedHLTResult = False
log.info("Decoding version set to 1, because HLTResult_EF found in pool file") log.info("Decoding version set to 1, because HLTResult_EF found in pool file")
elif cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_HLT"): elif cfgKeyStore.isInInputFile( "HLTResult", "HLTResult_HLT"):
TriggerFlags.EDMDecodingVersion = 2 TriggerFlags.EDMDecodingVersion = 2
TriggerFlags.doMergedHLTResult = True
else: else:
log.warning("No HLTResult found in pool file") log.warning("No HLTResult found in pool file")
pass pass
......
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