Rename EDMDecodingVersion to EDMVersion

```
git grep -l EDMDecodingVersion | xargs sed -i 's/EDMDecodingVersion/EDMVersion/g'
```

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)
 

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)

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()

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'  \

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"
 

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"]

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',

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" ]
   

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:

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:

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 = []

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'

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']
 

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):

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")

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)

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 = []

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)

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

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"""