diff --git a/Control/AthenaMonitoring/python/DQConfigFlags.py b/Control/AthenaMonitoring/python/DQConfigFlags.py
index 1f062c8b5b5b920835772f7403bc1c8c378865b4..b1f80d11541f07238106af7bf79c5746f83fce25 100644
--- a/Control/AthenaMonitoring/python/DQConfigFlags.py
+++ b/Control/AthenaMonitoring/python/DQConfigFlags.py
@@ -47,7 +47,7 @@ def createDQConfigFlags():
arg = lambda x: x.DQ.DataType != 'cosmics' # noqa: E731
if flag == 'doHLTMon':
# new HLT monitoring not yet compatible with pre-Run 3 data
- arg = lambda x: x.Trigger.EDMDecodingVersion == 3 # noqa: E731
+ arg = lambda x: x.Trigger.EDMVersion == 3 # noqa: E731
acf.addFlag('DQ.Steering.' + flag, arg)
diff --git a/Control/AthenaMonitoring/python/TriggerInterface.py b/Control/AthenaMonitoring/python/TriggerInterface.py
index 66bd119289194eedd59f8aadef92a60352fae371..20e9724036ab476814f88f2d56feee134c3c4f5b 100644
--- a/Control/AthenaMonitoring/python/TriggerInterface.py
+++ b/Control/AthenaMonitoring/python/TriggerInterface.py
@@ -31,7 +31,7 @@ def getTrigDecisionTool(flags):
if not flags.Input.isMC:
# need to work through exact details here
# tdt.UseOldEventInfoDecisionFormat = True
- tdt.NavigationFormat = "TrigComposite" if flags.Trigger.EDMDecodingVersion == 3 else "TriggerElement"
+ tdt.NavigationFormat = "TrigComposite" if flags.Trigger.EDMVersion == 3 else "TriggerElement"
else:
tdt.NavigationFormat = "TrigComposite" if 'HLTNav_Summary' in flags.Input.Collections else "TriggerElement"
rv.addPublicTool(tdt)
diff --git a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
index b01e613fe7ea9b13f2e1342c9f31eac37f119b3f..eed1ffa27ef79b9786f1705f73e54d2e3197f11e 100644
--- a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
@@ -357,7 +357,7 @@ if DQMonFlags.doMonitoring():
Steering.doLVL1CaloMon=DQMonFlags.doLVL1CaloMon()
Steering.doCTPMon=DQMonFlags.doCTPMon()
# do not enable new HLT monitoring if we are not in Run 3 EDM
- Steering.doHLTMon=DQMonFlags.doHLTMon() and ConfigFlags.Trigger.EDMDecodingVersion == 3
+ Steering.doHLTMon=DQMonFlags.doHLTMon() and ConfigFlags.Trigger.EDMVersion == 3
Steering.doPixelMon=DQMonFlags.doPixelMon()
Steering.doSCTMon=DQMonFlags.doSCTMon()
Steering.doTRTMon=DQMonFlags.doTRTMon()
diff --git a/HLT/Trigger/TrigTransforms/TrigTransform/share/test_run.sh b/HLT/Trigger/TrigTransforms/TrigTransform/share/test_run.sh
index d8c3bf0e688b490c7797f10bf1d5ea7326a28097..362b37531ebf2be9e891f00c3644d182b484b96b 100644
--- a/HLT/Trigger/TrigTransforms/TrigTransform/share/test_run.sh
+++ b/HLT/Trigger/TrigTransforms/TrigTransform/share/test_run.sh
@@ -396,7 +396,7 @@ Trig_reco_tf.py \
--outputNTUP_TRIGRATEFile="NTUP_TRIGRATE.04854087._000852.root.1" \
--outputNTUP_TRIGEBWGHTFile="NTUP_TRIGEBWGHT.04854087._000852.root.1" \
--geometryVersion 'ATLAS-R1-2012-02-00-00' --conditionsTag 'COMCOND-BLKPA-RUN1-07' --beamType 'collisions' --autoConfiguration 'everything' \
---preExec "RAWtoESD:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.EDMDecodingVersion=2;DQMonFlags.doStreamAwareMon=False;DQMonFlags.enableLumiAccess=False;from JetRec.JetRecFlags import jetFlags;jetFlags.useTracks=False;DQMonFlags.doLVL1CaloMon=False;DQMonFlags.doCTPMon=False" "ESDtoAOD:DQMonFlags.doStreamAwareMon=False;DQMonFlags.enableLumiAccess=False;from JetRec.JetRecFlags import jetFlags;jetFlags.useTracks=False;DQMonFlags.doLVL1CaloMon=False;DQMonFlags.doCTPMon=False;from TrigHLTMonitoring.HLTMonFlags import HLTMonFlags;HLTMonFlags.doTau=False" \
+--preExec "RAWtoESD:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.EDMVersion=2;DQMonFlags.doStreamAwareMon=False;DQMonFlags.enableLumiAccess=False;from JetRec.JetRecFlags import jetFlags;jetFlags.useTracks=False;DQMonFlags.doLVL1CaloMon=False;DQMonFlags.doCTPMon=False" "ESDtoAOD:DQMonFlags.doStreamAwareMon=False;DQMonFlags.enableLumiAccess=False;from JetRec.JetRecFlags import jetFlags;jetFlags.useTracks=False;DQMonFlags.doLVL1CaloMon=False;DQMonFlags.doCTPMon=False;from TrigHLTMonitoring.HLTMonFlags import HLTMonFlags;HLTMonFlags.doTau=False" \
--outputBSFile="RAW.05530098._000001.pool.root.1" \
--outputESDFile='thetestESD.pool.root' \
--outputAODFile='thetestAOD.pool.root' \
diff --git a/PhysicsAnalysis/PATJobTransforms/share/skeleton.PhysicsValidation_tf.py b/PhysicsAnalysis/PATJobTransforms/share/skeleton.PhysicsValidation_tf.py
index 0ccf0a0e6431f6163dfb54fe5bd77ee1aeffc1b3..231263ca994c74ef7afcb6503e0763f06384c510 100644
--- a/PhysicsAnalysis/PATJobTransforms/share/skeleton.PhysicsValidation_tf.py
+++ b/PhysicsAnalysis/PATJobTransforms/share/skeleton.PhysicsValidation_tf.py
@@ -155,7 +155,7 @@ if hasattr(runArgs,"postExec"):
# Temporary (July 19) trigger additions
-if ConfigFlags.Trigger.EDMDecodingVersion == 3:
+if ConfigFlags.Trigger.EDMVersion == 3:
if hasattr(ToolSvc, 'TrigDecisionTool'):
ToolSvc.TrigDecisionTool.NavigationFormat="TrigComposite"
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py b/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
index f93f8dcb14f22f86b3e74775260245865f25add8..b13672e640705011291f7fc31d35de3368a8f881 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
@@ -33,7 +33,7 @@ DQMonFlags.doMonitoring.set_Value_and_Lock(False)
DQMonFlags.doLArMon.set_Value_and_Lock(False)
# Legacy (Run-2) trigger produces Run-2 EDM
-ConfigFlags.Trigger.EDMDecodingVersion = 2
+ConfigFlags.Trigger.EDMVersion = 2
#disable offline ID configuration and reco
from InDetRecExample.InDetJobProperties import InDetFlags
@@ -154,8 +154,8 @@ if _streamRDO:
_TriggerESDList = {}
_TriggerAODList = {}
from TrigEDMConfig.TriggerEDM import getTriggerEDMList
- _TriggerESDList.update( getTriggerEDMList(TriggerFlags.ESDEDMSet(), ConfigFlags.Trigger.EDMDecodingVersion) )
- _TriggerAODList.update( getTriggerEDMList(TriggerFlags.AODEDMSet(), ConfigFlags.Trigger.EDMDecodingVersion) )
+ _TriggerESDList.update( getTriggerEDMList(TriggerFlags.ESDEDMSet(), ConfigFlags.Trigger.EDMVersion) )
+ _TriggerAODList.update( getTriggerEDMList(TriggerFlags.AODEDMSet(), ConfigFlags.Trigger.EDMVersion) )
_streamRDO.ItemList += ["HLT::HLTResult#HLTResult_HLT"]
_streamRDO.ItemList += ["TrigDec::TrigDecision#TrigDecision"]
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
index 1243cb23f1bef3c140f4b1b06f6c28677d7e12e0..f07a3200e976d2ed9d2ffc988a10043af6a3933d 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
@@ -75,7 +75,7 @@ primary_bphys = [
'HLT_mu11_mu6_bDimu',
]
-if ConfigFlags.Trigger.EDMDecodingVersion == 3 :
+if ConfigFlags.Trigger.EDMVersion == 3 :
monitoring_bphys = [
'HLT_2mu4_bJpsimumu_L12MU4',
'HLT_2mu4_bUpsimumu_L12MU4',
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
index dfd33f3bb2e229e845e3e1ec2a1f44cfc2a051b6..f0352bcc1183744ceeea70cfce052d2c5f92c7c5 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
@@ -17,7 +17,7 @@ containers = [
"HLT_xAOD__TrigBphysContainer_MultiTrkFex",
"HLT_xAOD__TrigBphysContainer_EFTrackMass"
]
-if ConfigFlags.Trigger.EDMDecodingVersion == 3 :
+if ConfigFlags.Trigger.EDMVersion == 3 :
# will add the MT version of TrigBphys containers once they are available in EDM
containers = [ "HLT_DimuEF" ]
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/share/TrigHLTMonCommon_jobOptions.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/share/TrigHLTMonCommon_jobOptions.py
index ae5eae361c2ba0485f7eb415af465526e2069988..76b1b6efa203a0d32bbe60ac25d6b56737a0f012 100755
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/share/TrigHLTMonCommon_jobOptions.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/share/TrigHLTMonCommon_jobOptions.py
@@ -126,7 +126,7 @@ if data_type == 'pool':
from TrigEDMConfig.TriggerEDM import EDMLibraries
ToolSvc.TrigDecisionTool.Navigation.Dlls = [e for e in EDMLibraries if 'TPCnv' not in e]
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- if ConfigFlags.Trigger.EDMDecodingVersion == 3:
+ if ConfigFlags.Trigger.EDMVersion == 3:
ToolSvc.TrigDecisionTool.NavigationFormat="TrigComposite"
if hasattr(runArgs,"useDB") and runArgs.useDB:
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
index 10bc44022b22609627e2a749f26f4bff4bf25363..b5c4733cbeed61bcea8ee56b5b1dfa563628af0f 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
@@ -15,7 +15,7 @@ def TrigIDPhysValMonitoringTool( legacy_monitoring=False ):
from AthenaConfiguration.AllConfigFlags import ConfigFlags
mt_chains = True
- if ( ConfigFlags.Trigger.EDMDecodingVersion < 3 or legacy_monitoring ) :
+ if ( ConfigFlags.Trigger.EDMVersion < 3 or legacy_monitoring ) :
mt_chains = False
if rec.doInDet:
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
index a9dd373b59419fd5e184eaf240ad7f502008fa66..219a1bbc5bff3599c3de32fc4534ebd53e3c714a 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
@@ -9,7 +9,7 @@ def TrigIDtrkMonitoringTool( legacy_monitoring=False ):
from AthenaConfiguration.AllConfigFlags import ConfigFlags
mt_chains = True
- if ( ConfigFlags.Trigger.EDMDecodingVersion < 3 or legacy_monitoring ) :
+ if ( ConfigFlags.Trigger.EDMVersion < 3 or legacy_monitoring ) :
mt_chains = False
list = []
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
index 05eae3edd3ee58507ba713d160a78d761729eb14..f118878e94cc0a0c11ff95a6c83c121f904b6262 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
@@ -177,7 +177,7 @@ def TrigJetMonConfig(inputFlags):
# This is the right place to get the info, but the autoconfig of the flag
# is not yet implemented
- AthenaMT = ConfigFlags.Trigger.EDMDecodingVersion==3
+ AthenaMT = ConfigFlags.Trigger.EDMVersion==3
# AthenaMT or Legacy
InputType = 'MT' if AthenaMT else 'Legacy'
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
index 2367d76f3ab9a1714098ef576bc2d34d2034c25e..1a93af725bcfac8efccbb2bf654fe641a89fa414 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
@@ -6,21 +6,21 @@ monitoring_muonNonIso = ['HLT_mu50']
monitoring_muonNonIso_HI = ['HLT_mu8','HLT_mu3', 'HLT_mu4']#8TeV
#monitoring_muonNonIso_HI = ['HLT_mu10','HLT_mu14']
monitoring_muonNonIso_pp = ['HLT_mu50']
-if ConfigFlags.Trigger.EDMDecodingVersion == 3:
+if ConfigFlags.Trigger.EDMVersion == 3:
monitoring_muonNonIso = ['HLT_mu50_L1MU20']
monitoring_muonNonIso_pp = ['HLT_mu50_L1MU20']
monitoring_muonIso = ['HLT_mu26_ivarmedium']
monitoring_muonIso_HI = ['']
monitoring_muonIso_pp = ['HLT_mu26_ivarmedium']
-if ConfigFlags.Trigger.EDMDecodingVersion == 3:
+if ConfigFlags.Trigger.EDMVersion == 3:
monitoring_muonIso = ['HLT_mu26_ivarmedium_L1MU20']
monitoring_muonIso_pp = ['HLT_mu26_ivarmedium_L1MU20']
monitoring_MSonly = ['HLT_mu60_0eta105_msonly']
monitoring_MSonly_HI = ['HLT_mu15_msonly']
monitoring_MSonly_pp = ['HLT_mu60_0eta105_msonly']
-if ConfigFlags.Trigger.EDMDecodingVersion == 3:
+if ConfigFlags.Trigger.EDMVersion == 3:
monitoring_MSonly = ['HLT_mu60_0eta105_msonly_L1MU20']
monitoring_MSonly_pp = ['HLT_mu60_0eta105_msonly_L1MU20']
diff --git a/Trigger/TrigValidation/TrigValAlgs/python/TrigValAlgsConfig.py b/Trigger/TrigValidation/TrigValAlgs/python/TrigValAlgsConfig.py
index cf76b1357115d5f7f88bb8be6ef6e63bd7861cab..41a61532b59048257d5999ba054d8a9240b2e4bc 100755
--- a/Trigger/TrigValidation/TrigValAlgs/python/TrigValAlgsConfig.py
+++ b/Trigger/TrigValidation/TrigValAlgs/python/TrigValAlgsConfig.py
@@ -66,7 +66,7 @@ class TrigEDMChecker ( TrigEDMChecker ):
def getEDMAuxList():
from TrigEDMConfig.TriggerEDM import getTriggerEDMList
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- EDMVersion = ConfigFlags.Trigger.EDMDecodingVersion
+ EDMVersion = ConfigFlags.Trigger.EDMVersion
tlist=getTriggerEDMList('AODFULL',EDMVersion)
objlist=[]
for t,kset in six.iteritems(tlist):
diff --git a/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py b/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
index 790f374fd284900c5127d5a4afc60628759ca44a..5c7ea8eba36555cd52df53db1b28ffbbcd9373f8 100644
--- a/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
+++ b/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
@@ -30,7 +30,7 @@ doTAG=False
rec.doTruth.set_Value_and_Lock(False)
# Legacy (Run-2) trigger produces Run-2 EDM
-ConfigFlags.Trigger.EDMDecodingVersion = 2
+ConfigFlags.Trigger.EDMVersion = 2
#-----------------------------------------------------------
include("RecExCond/RecExCommon_flags.py")
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
index 7875574b0c5c866f4f0297e1669f9fb4ff589e51..a7378fe507517ac42094f83b9f23ccc823687df2 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
@@ -28,10 +28,10 @@ class xAODConversionGetter(Configured):
from TrigEDMConfig.TriggerEDM import getPreregistrationList
from TrigEDMConfig.TriggerEDM import getEFRun1BSList,getEFRun2EquivalentList,getL2Run1BSList,getL2Run2EquivalentList
- xaodconverter.Navigation.ClassesToPreregister = getPreregistrationList(ConfigFlags.Trigger.EDMDecodingVersion)
- ## if ConfigFlags.Trigger.EDMDecodingVersion == 2:
+ xaodconverter.Navigation.ClassesToPreregister = getPreregistrationList(ConfigFlags.Trigger.EDMVersion)
+ ## if ConfigFlags.Trigger.EDMVersion == 2:
## # if TriggerFlags.doMergedHLTResult():
- ## #if ConfigFlags.Trigger.EDMDecodingVersion == 2: #FPP
+ ## #if ConfigFlags.Trigger.EDMVersion == 2: #FPP
## xaodconverter.Navigation.ClassesToPreregister = getHLTPreregistrationList()
## else:
## xaodconverter.Navigation.ClassesToPreregister = list(set(getL2PreregistrationList()+getEFPreregistrationList()+getHLTPreregistrationList()))
@@ -124,7 +124,7 @@ class ByteStreamUnpackGetterRun2(Configured):
extr.Navigation.Dlls = getEDMLibraries()
from TrigEDMConfig.TriggerEDM import getPreregistrationList
- extr.Navigation.ClassesToPreregister = getPreregistrationList(ConfigFlags.Trigger.EDMDecodingVersion)
+ extr.Navigation.ClassesToPreregister = getPreregistrationList(ConfigFlags.Trigger.EDMVersion)
if TriggerFlags.doMergedHLTResult():
extr.L2ResultKey=""
@@ -160,7 +160,7 @@ class ByteStreamUnpackGetterRun2(Configured):
from AthenaCommon.AppMgr import ToolSvc
ToolSvc += TrigSerToolTP
from TrigEDMConfig.TriggerEDM import getTPList
- TrigSerToolTP.TPMap = getTPList((ConfigFlags.Trigger.EDMDecodingVersion))
+ TrigSerToolTP.TPMap = getTPList((ConfigFlags.Trigger.EDMVersion))
from TrigSerializeCnvSvc.TrigSerializeCnvSvcConf import TrigSerializeConvHelper
TrigSerializeConvHelper = TrigSerializeConvHelper(doTP = True)
@@ -294,25 +294,25 @@ class HLTTriggerResultGetter(Configured):
topSequence = AlgSequence()
log.info("BS unpacking (TF.readBS): %d", TriggerFlags.readBS() )
if TriggerFlags.readBS():
- if ConfigFlags.Trigger.EDMDecodingVersion <= 2:
+ if ConfigFlags.Trigger.EDMVersion <= 2:
bs = ByteStreamUnpackGetterRun2() # noqa: F841
else:
bs = ByteStreamUnpackGetter() # noqa: F841
xAODContainers = {}
# if not recAlgs.doTrigger(): #only convert when running on old data
- if ConfigFlags.Trigger.EDMDecodingVersion == 1:
+ if ConfigFlags.Trigger.EDMVersion == 1:
xaodcnvrt = xAODConversionGetter()
xAODContainers = xaodcnvrt.xaodlist
if recAlgs.doTrigger() or TriggerFlags.doTriggerConfigOnly():
- if ConfigFlags.Trigger.EDMDecodingVersion <= 2:
+ if ConfigFlags.Trigger.EDMVersion <= 2:
tdt = TrigDecisionGetterRun2() # noqa: F841
else:
tdt = TrigDecisionGetter() # noqa: F841
# Temporary hack to add Run-3 navigation to ESD and AOD
- if (rec.doESD() or rec.doAOD()) and ConfigFlags.Trigger.EDMDecodingVersion == 3:
+ if (rec.doESD() or rec.doAOD()) and ConfigFlags.Trigger.EDMVersion == 3:
# The hack with wildcards is needed for BS->ESD because we don't know the exact keys
# of HLT navigation containers before unpacking them from the BS event.
objKeyStore._store['streamESD'].allowWildCard(True)
@@ -381,17 +381,17 @@ class HLTTriggerResultGetter(Configured):
if(xAODContainers):
_TriggerESDList.update( xAODContainers )
else:
- _TriggerESDList.update( getTriggerEDMList(TriggerFlags.ESDEDMSet(), ConfigFlags.Trigger.EDMDecodingVersion) )
+ _TriggerESDList.update( getTriggerEDMList(TriggerFlags.ESDEDMSet(), ConfigFlags.Trigger.EDMVersion) )
- log.info("ESD content set according to the ESDEDMSet flag: %s and EDM version %d", TriggerFlags.ESDEDMSet(), ConfigFlags.Trigger.EDMDecodingVersion)
+ log.info("ESD content set according to the ESDEDMSet flag: %s and EDM version %d", TriggerFlags.ESDEDMSet(), ConfigFlags.Trigger.EDMVersion)
# AOD objects choice
_TriggerAODList = {}
#from TrigEDMConfig.TriggerEDM import getAODList
- _TriggerAODList.update( getTriggerEDMList(TriggerFlags.AODEDMSet(), ConfigFlags.Trigger.EDMDecodingVersion) )
+ _TriggerAODList.update( getTriggerEDMList(TriggerFlags.AODEDMSet(), ConfigFlags.Trigger.EDMVersion) )
- log.info("AOD content set according to the AODEDMSet flag: %s and EDM version %d", TriggerFlags.AODEDMSet(),ConfigFlags.Trigger.EDMDecodingVersion)
+ log.info("AOD content set according to the AODEDMSet flag: %s and EDM version %d", TriggerFlags.AODEDMSet(),ConfigFlags.Trigger.EDMVersion)
log.debug("ESD EDM list: %s", _TriggerESDList)
log.debug("AOD EDM list: %s", _TriggerAODList)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index 2e754db3f0354cf9c53fcfc53e08ebb36abd5e89..b22940f2d6cb5b0eedbd0b62562e7861ab8b3330 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -390,7 +390,7 @@ def triggerBSOutputCfg(flags, summaryAlg, offline=False):
def triggerPOOLOutputCfg(flags, edmSet):
# Get the list of output collections from TriggerEDM
from TrigEDMConfig.TriggerEDM import getTriggerEDMList
- edmList = getTriggerEDMList(edmSet, flags.Trigger.EDMDecodingVersion)
+ edmList = getTriggerEDMList(edmSet, flags.Trigger.EDMVersion)
# Build the output ItemList
itemsToRecord = []
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 50490bf04b8dfd15633525f187999afe246e1c5d..098019e649db91a1031cb2c8e7f05a39a84b8cb3 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -47,21 +47,21 @@ def createTriggerFlags():
flags.addFlag('Trigger.doCalo', True)
# if 1, Run1 decoding version is set; if 2, Run2; if 3, Run 3
- def EDMDecodingVersion(flags):
+ def EDMVersion(flags):
'''
Determine Trigger EDM version based on the input file. For ByteStream, Run-3 EDM is indicated
by HLT ROD version > 1.0, for both Runs 1 and 2 the HLT ROD version was 0.0 and the run number
is used to disambiguate between them. For POOL inputs, the EDM version is determined based on
finding a characteristic HLT navigation collection in the file.
'''
- _log = logging.getLogger('TriggerConfigFlags.EDMDecodingVersion')
- _log.debug("Attempting to determine EDMDecodingVersion")
+ _log = logging.getLogger('TriggerConfigFlags.EDMVersion')
+ _log.debug("Attempting to determine EDMVersion")
default_version = 3
if flags.Input.Format=="BS":
_log.debug("Input format is ByteStream")
inputFileName = flags.Input.Files[0]
if not inputFileName and flags.Common.isOnline():
- _log.info("Online reconstruction, no input file. Return default EDMDecodingVersion=%d", default_version)
+ _log.info("Online reconstruction, no input file. Return default EDMVersion=%d", default_version)
return default_version
_log.debug("Checking ROD version")
@@ -84,7 +84,7 @@ def createTriggerFlags():
_log.warning("Cannot determine HLT ROD version from input file, falling back to run-number-based decision")
# Case 2: ROD version indicating Run 3
elif rodVersionM >= 1:
- _log.info("Determined EDMDecodingVersion to be 3, because running on BS file with HLT ROD version %d.%d",
+ _log.info("Determined EDMVersion to be 3, because running on BS file with HLT ROD version %d.%d",
rodVersionM, rodVersionL)
return 3
# Case 3: ROD version indicating Run 1 or 2 - use run number to disambiguate
@@ -96,41 +96,41 @@ def createTriggerFlags():
if not runNumber or runNumber <= 0:
_log.warning("Cannot determine EDM version because run number %s is invalid. "
- "Return default EDMDecodingVersion=%d", runNumber, default_version)
+ "Return default EDMVersion=%d", runNumber, default_version)
return default_version
elif runNumber < boundary_run12:
# Run-1 data
- _log.info("Determined EDMDecodingVersion to be 1 based on BS file run number (runNumber < %d)",
+ _log.info("Determined EDMVersion to be 1 based on BS file run number (runNumber < %d)",
boundary_run12)
return 1
elif runNumber < boundary_run23:
# Run-2 data
- _log.info("Determined EDMDecodingVersion to be 2 based on BS file run number (%d < runNumber < %d)",
+ _log.info("Determined EDMVersion to be 2 based on BS file run number (%d < runNumber < %d)",
boundary_run12, boundary_run23)
return 2
else:
# Run-3 data
- _log.info("Determined EDMDecodingVersion to be 3 based on BS file run number (runNumber > %d)",
+ _log.info("Determined EDMVersion to be 3 based on BS file run number (runNumber > %d)",
boundary_run23)
return 3
else:
# POOL files: decide based on HLT output type present in the file
- _log.debug("EDMDecodingVersion: Input format is POOL -- determine from input file collections")
+ _log.debug("EDMVersion: Input format is POOL -- determine from input file collections")
if "HLTResult_EF" in flags.Input.Collections:
- _log.info("Determined EDMDecodingVersion to be 1, because HLTResult_EF found in POOL file")
+ _log.info("Determined EDMVersion to be 1, because HLTResult_EF found in POOL file")
return 1
elif "TrigNavigation" in flags.Input.Collections:
- _log.info("Determined EDMDecodingVersion to be 2, because TrigNavigation found in POOL file")
+ _log.info("Determined EDMVersion to be 2, because TrigNavigation found in POOL file")
return 2
elif "HLTNav_Summary" in flags.Input.Collections:
- _log.info("Determined EDMDecodingVersion to be 3, because HLTNav_Summary found in POOL file")
+ _log.info("Determined EDMVersion to be 3, because HLTNav_Summary found in POOL file")
return 3
- _log.warning("Could not determine EDM version from the input file. Return default EDMDecodingVersion=%d",
+ _log.warning("Could not determine EDM version from the input file. Return default EDMVersion=%d",
default_version)
return default_version
- flags.addFlag('Trigger.EDMDecodingVersion', lambda prevFlags: EDMDecodingVersion(prevFlags))
+ flags.addFlag('Trigger.EDMVersion', lambda prevFlags: EDMVersion(prevFlags))
# enables additional algorithms colecting MC truth infrmation (this is only used by IDso maybe we need Trigger.ID.doTruth only?)
flags.addFlag('Trigger.doTruth', False)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
index 0d036ccf75d1c4dca137318f83632caf3942552d..80f066e402e70d301d0c4acf4609f13d95744084 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
@@ -243,7 +243,7 @@ class TriggerConfigGetter(Configured):
# START OF TEMPORARY SOLUTION FOR RUN-3 TRIGGER DEVELOPMENT
########################################################################
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- if ConfigFlags.Trigger.EDMDecodingVersion >= 3:
+ if ConfigFlags.Trigger.EDMVersion >= 3:
if self.hasxAODMeta:
if not hasattr(svcMgr, 'xAODConfigSvc'):
from TrigConfxAOD.TrigConfxAODConf import TrigConf__xAODConfigSvc
@@ -441,7 +441,7 @@ class TriggerConfigGetter(Configured):
writeTriggerMenu = True
writeMenuJSON = False
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- if ConfigFlags.Trigger.EDMDecodingVersion <= 2:
+ if ConfigFlags.Trigger.EDMVersion <= 2:
from TrigConfxAOD.TrigConfxAODConf import TrigConf__xAODMenuWriter
topAlgs += TrigConf__xAODMenuWriter( OverwriteEventObj = True )
else:
@@ -490,7 +490,7 @@ class TriggerConfigGetter(Configured):
]
objKeyStore.addManyTypesMetaData( metadataItems )
- if ConfigFlags.Trigger.EDMDecodingVersion >= 3:
+ if ConfigFlags.Trigger.EDMVersion >= 3:
from TrigEDMConfig.TriggerEDMRun3 import recordable
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index b20416d0477fca318c267991fce473e1dd117c44..6363d61dcce9a858055e3a53ea64dd30cc0d4cb6 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -96,7 +96,7 @@ class doMT(JobProperty):
_flags.append(doMT)
-class EDMDecodingVersion(JobProperty):
+class EDMVersion(JobProperty):
""" if 1, Run1 decoding version is set; if 2, Run2; if 3, Run3 """
statusOn=False
allowedType=['int']
@@ -109,13 +109,13 @@ class EDMDecodingVersion(JobProperty):
def __call__(self):
if not self.statusOn:
log = logging.getLogger('TriggerJobOpts.TriggerFlags')
- log.warning('TriggerFlags.EDMDecodingVersion is deprecated, please use ConfigFlags.Trigger.EDMDecodingVersion')
+ log.warning('TriggerFlags.EDMVersion is deprecated, please use ConfigFlags.Trigger.EDMVersion')
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- self.StoredValue = ConfigFlags.Trigger.EDMDecodingVersion
+ self.StoredValue = ConfigFlags.Trigger.EDMVersion
self.statusOn = True
return JobProperty.__call__(self)
-_flags.append(EDMDecodingVersion)
+_flags.append(EDMVersion)
class enableMonitoring(JobProperty):
""" enables certain monitoring type: Validation, Online, Time"""
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
index db97896cd0a73d81af82f08cde2b200298109cba..24348b552b5f5215fa8f544f31745af89796fa8c 100755
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
@@ -9,7 +9,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
# Legacy (Run-2) trigger produces Run-2 EDM
-ConfigFlags.Trigger.EDMDecodingVersion = 2
+ConfigFlags.Trigger.EDMVersion = 2
if globalflags.InputFormat() == 'bytestream':
TriggerFlags.doLVL1=False
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py b/Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py
index a075da975a737b6efee6b1c913951bfbef07ea30..fe3e8dece860eb2828d3677a8db4d98a22bb8420 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py
@@ -65,7 +65,7 @@ outSequence.remove( StreamESD )
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from TriggerJobOpts.TriggerFlags import TriggerFlags
from TrigEDMConfig.TriggerEDM import getTriggerEDMList
-edmList = getTriggerEDMList(TriggerFlags.ESDEDMSet(), ConfigFlags.Trigger.EDMDecodingVersion)
+edmList = getTriggerEDMList(TriggerFlags.ESDEDMSet(), ConfigFlags.Trigger.EDMVersion)
if len(ItemList) == 0:
for edmType, edmKeys in edmList.items():
for key in edmKeys:
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 58b2a1dbc12f8890d5f5be1d5424c35afaedeb79..1ef81f81c0c1dd414a8e2f56762fe74fb4c01877 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -169,7 +169,7 @@ else: # athenaHLT
ConfigFlags.Input.Format = 'BS' if globalflags.InputFormat=='bytestream' else 'POOL'
# Run-3 Trigger produces Run-3 EDM
-ConfigFlags.Trigger.EDMDecodingVersion = 3
+ConfigFlags.Trigger.EDMVersion = 3
# Set final Cond/Geo tag based on input file, command line or default
globalflags.DetDescrVersion = opt.setDetDescr or ConfigFlags.Trigger.OnlineGeoTag
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_run2.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_run2.py
index bdb7ccd920b93f0c5451e90612f24df444321f92..80221b88dfb0aeb8472e4b66669629f456ed157c 100755
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_run2.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_run2.py
@@ -404,7 +404,7 @@ elif PoolRDOInput!=None:
ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
# Legacy (Run-2) trigger produces Run-2 EDM
-ConfigFlags.Trigger.EDMDecodingVersion = 2
+ConfigFlags.Trigger.EDMVersion = 2
# Conditions and geometry tag
if globalflags.InputFormat.is_pool() and (setDetDescr==None or setGlobalTag==None):
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/test/test_TriggerFlags_autoconf.py b/Trigger/TriggerCommon/TriggerJobOpts/test/test_TriggerFlags_autoconf.py
index 791d3b8da770a79cfbfdb4e023f185621363ada3..fec10986d954cacc745c23c466e959e2080fbc46 100755
--- a/Trigger/TriggerCommon/TriggerJobOpts/test/test_TriggerFlags_autoconf.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/test/test_TriggerFlags_autoconf.py
@@ -47,14 +47,14 @@ def test_TriggerFlags(sample):
acf.Input.Files = [inputfiles[sample]]
acf.addFlagsCategory("Trigger", createTriggerFlags)
- # Test EDMDecodingVersion
+ # Test EDMVersion
EDMDecode_ref = {
"Run1": 1,
"Run2": 2,
"Run3": 3
}[sample[:4]]
- log.info("EDMDecodingVersion: expected {}, configured {}".format(EDMDecode_ref, acf.Trigger.EDMDecodingVersion))
- assert( acf.Trigger.EDMDecodingVersion == EDMDecode_ref )
+ log.info("EDMVersion: expected {}, configured {}".format(EDMDecode_ref, acf.Trigger.EDMVersion))
+ assert( acf.Trigger.EDMVersion == EDMDecode_ref )
return