[ATR-28536][ATR-28717][ATR-28782] Working towards a trigger EDM refactor and...

[ATR-28536][ATR-28717][ATR-28782] Working towards a trigger EDM refactor and integrating R4 into the EDM (part B)

[ATR-28536][ATR-28717][ATR-28782] Working towards a trigger EDM refactor and integrating R4 into the EDM (part B)

HLT/Trigger/TrigControl/TrigExamples/python/MTCalibPebConfig.py

@@ -214,14 +214,15 @@ def make_all_hypo_algs(num_chains, concurrent=False):
 
 def hlt_result_cfg(flags, hypo_algs):
     from TrigEDMConfig.DataScoutingInfo import getFullHLTResultID
-    from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3, EDMDetailsRun3
+    from TrigEDMConfig.TriggerEDMRun3 import EDMDetailsRun3
+    from TrigEDMConfig.TriggerEDM import getRawTriggerEDMList
     from TrigOutputHandling.TrigOutputHandlingConfig import TriggerEDMSerialiserToolCfg, StreamTagMakerToolCfg, TriggerBitsMakerToolCfg
 
     # Tool serialising EDM objects to fill the HLT result
     serialiser = TriggerEDMSerialiserToolCfg(flags, 'Serialiser')
     # Add some framework EDM to the output, but skip the ones in EDMDetailsRun3 to avoid the fuss
     serialiser.addCollectionListToMainResult([
-        coll[0] for coll in TriggerHLTListRun3 if 'BS' in coll[1] and coll[2]=='Steer' and not coll[0].split('#')[0] in EDMDetailsRun3
+        coll[0] for coll in getRawTriggerEDMList(flags, runVersion=3) if 'BS' in coll[1] and coll[2]=='Steer' and not coll[0].split('#')[0] in EDMDetailsRun3
     ])
     for hypo in hypo_algs:
         serialiser.addCollectionListToMainResult([

PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/python/TrigSlimmingHelper.py

@@ -9,9 +9,6 @@ from TrigEDMConfig.TriggerEDM import getTriggerEDMList
 def addTrigEDMSetToOutput(flags, helper: SlimmingHelper, edmSet: str, edmVersion: int = None):
     """Add a full trigger EDM set to the output slimming helper"""
 
-    # NB: I'm not sure that importing and using the ConfigFlags is a pattern that we want to
-    # encourage, but given that the derivations aren't built with CA's yet this is the best I can
-    # do...
     if edmVersion is None:
         edmVersion = flags.Trigger.EDMVersion
 
@@ -19,7 +16,7 @@ def addTrigEDMSetToOutput(flags, helper: SlimmingHelper, edmSet: str, edmVersion
     if edmVersion == -1:
         return
 
-    edmList = getTriggerEDMList(edmSet, edmVersion, flags.Trigger.ExtraEDMList)
+    edmList = getTriggerEDMList(flags, key=edmSet, runVersion=edmVersion)
     # This list is a mapping from container type to a list of required container names
     # This includes the Aux containers and their lists of aux variables.
     # The SlimmingHelper however requires the list of *interface* (non-Aux) containers with

Reconstruction/TLARecoConfig/python/DAOD_TLA_OutputConfig.py

@@ -13,7 +13,7 @@ def DAOD_TLA_OutputCfg(flags,additional_items=[]):
     acc = ComponentAccumulator()
 
     from TrigEDMConfig.TriggerEDM import getTriggerEDMList
-    edmList = getTriggerEDMList(flags.Trigger.ESDEDMSet, flags.Trigger.EDMVersion, flags.Trigger.ExtraEDMList)
+    edmList = getTriggerEDMList(flags, key=flags.Trigger.ESDEDMSet)
 
     ItemList = []
     for edmType, edmKeys in edmList.items():

Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py

@@ -45,11 +45,11 @@ def update_streamerinfos(objects, updated_objects):
   print("")
 
   if doEDM:
-    from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3
+    from TrigEDMConfig.TriggerEDM import getRawTriggerEDMList
     from TrigEDMConfig.DataScoutingInfo import getAllDataScoutingIdentifiers
     BS_destinations = ["BS"] + getAllDataScoutingIdentifiers()
     print("BS_destinations = {}".format(BS_destinations))
-    for item in TriggerHLTListRun3:
+    for item in getRawTriggerEDMList(flags=None, runVersion=3):
       if any(bs in item[1].split() for bs in BS_destinations):
         objects.append(item[0].split("#")[0])
 

Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py

@@ -41,7 +41,7 @@ def NavConverterCfg(flags, chainsList = [], runTheChecker = False):
     cnvAlg.Rois = ["initialRoI","forID","forID1","forID2","forMS","forSA","forTB","forMT","forCB"]
 
     from TrigEDMConfig.TriggerEDM import getTriggerEDMList
-    edm = getTriggerEDMList("AODCONV", flags.Trigger.EDMVersion)
+    edm = getTriggerEDMList(flags, "AODCONV")
     types = [ t for t in edm ]
     log.info("Assuming these collections are relevant for trigger: %s", " ".join(types))
     cnvAlg.Collections = types

Trigger/TrigValidation/TrigAnalysisTest/bin/checkFileTrigSize.py

@@ -14,8 +14,8 @@ import re
 
 from optparse import OptionParser
 
-import TrigEDMConfig.TriggerEDM     as edm
-import TrigEDMConfig.TriggerEDMRun3 as edmRun3
+import TrigEDMConfig.TriggerEDM as edm
+from edm import getRawTriggerEDMList
 
 
 # 'Counter' just contains the list of classes you want to include and the size
@@ -1160,7 +1160,7 @@ class checkFileTrigSize:
         ## Calculate trigger category sizes for AODCOMM
 
         self.triggerAlgListCOMM = []
-        edmRun3List = edmRun3.TriggerHLTListRun3
+        edmRun3List = getRawTriggerEDMList(flags=None, runVersion=3)
         for tup in edmRun3List:
             contName = tup[0].split("#")[1]
             edmSet = tup[1]

Trigger/TrigValidation/TrigP1Test/python/DetectStreamerInfoChanges.py

@@ -41,11 +41,11 @@ def append_versions(objects, cname):
 if __name__ == '__main__':
     objects = []
     if doTrigEDMOnly:
-        from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3
+        from TrigEDMConfig.TriggerEDM import getRawTriggerEDMList
         from TrigEDMConfig.DataScoutingInfo import getAllDataScoutingIdentifiers
         BS_destinations = ["BS"] + getAllDataScoutingIdentifiers()
         log.warning("BS_destinations = {}".format(BS_destinations))
-        for item in TriggerHLTListRun3:
+        for item in getRawTriggerEDMList(flags=None, runVersion=3):
             if any(bs in item[1].split() for bs in BS_destinations):
                 objects.append(item[0].split("#")[0])
     else:

Trigger/TrigValidation/TrigP1Test/python/PEBDSTest.py

@@ -7,20 +7,7 @@ This test defines its own version of the Dev_pp_run3_v1 menu and the correspondi
 and executes several chains testing various types of Partial Event Building and Data Scouting
 '''
 
-from TrigEDMConfig import DataScoutingInfo, TriggerEDMRun3
-
-# Modify EDM list to add collections to DataScouting results
-# ATR-28536 - do this first, before the list gets imported into any other modules
-myTriggerHLTListRun3 = []
-for collectionConfig in TriggerEDMRun3.TriggerHLTListRun3:
-    if 'Electron' in collectionConfig[0]:
-        modConfig = list(collectionConfig)
-        modConfig[1] += ' ElectronDSTest ElectronDSPEBTest'
-        myTriggerHLTListRun3.append(tuple(modConfig))
-    else:
-        myTriggerHLTListRun3.append(collectionConfig)
-TriggerEDMRun3.TriggerHLTListRun3 = myTriggerHLTListRun3
-
+from TrigEDMConfig import DataScoutingInfo
 from TriggerMenuMT.HLT.Menu import Dev_pp_run3_v1, EventBuildingInfo, StreamInfo
 from TriggerMenuMT.HLT.Config.Utility.ChainDefInMenu import ChainProp
 from TriggerMenuMT.HLT.CommonSequences import EventBuildingSequences
@@ -165,9 +152,6 @@ myAllStreams = [
 
 StreamInfo._all_streams = myAllStreams
 
-
-
-
 def run(flags):
     from TriggerJobOpts import runHLT
     # Set and customize default flags
@@ -175,6 +159,23 @@ def run(flags):
     flags.Trigger.triggerMenuSetup = 'Dev_pp_run3_v1'
     flags.Trigger.enabledSignatures = ['Egamma','Muon']
     flags.Trigger.doLVL1 = True
+    # Add ElectronDSTest ElectronDSPEBTest to a number of existing EDM entries in the Run 3 electron EDM 
+    flags.Trigger.ExtraEDMList = [
+            ['xAOD::TrigElectronContainer#HLT_FastElectrons',                      'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'], 
+            ['xAOD::TrigElectronAuxContainer#HLT_FastElectronsAux.',               'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::TrackParticleContainer#HLT_IDTrack_Electron_FTF',              'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::TrackParticleAuxContainer#HLT_IDTrack_Electron_FTFAux.',       'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::TrackParticleContainer#HLT_IDTrack_Electron_IDTrig',           'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::TrackParticleAuxContainer#HLT_IDTrack_Electron_IDTrigAux.',    'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::TrackParticleContainer#HLT_IDTrack_Electron_GSF',              'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::TrackParticleAuxContainer#HLT_IDTrack_Electron_GSFAux.',       'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::CaloClusterContainer#HLT_CaloEMClusters_Electron',             'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::CaloClusterTrigAuxContainer#HLT_CaloEMClusters_ElectronAux.',  'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::ElectronContainer#HLT_egamma_Electrons',                       'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::ElectronAuxContainer#HLT_egamma_ElectronsAux.',                'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::ElectronContainer#HLT_egamma_Electrons_GSF',                   'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+            ['xAOD::ElectronAuxContainer#HLT_egamma_Electrons_GSFAux.',            'BS ESD AODFULL ElectronDSTest ElectronDSPEBTest', 'Egamma'],
+        ]
     flags.lock()
     acc = runHLT.runHLTCfg(flags)
     return acc

Trigger/TrigValidation/TrigValAlgs/python/TrigValAlgsConfig.py

@@ -34,7 +34,7 @@ def TrigEDMAuxCheckerCfg(flags, name="TrigEDMAuxChecker"):
 
 def getEDMAuxList(flags):
     from TrigEDMConfig.TriggerEDM import getTriggerEDMList
-    tlist=getTriggerEDMList(flags.Trigger.AODEDMSet, flags.Trigger.EDMVersion)
+    tlist=getTriggerEDMList(flags, key=flags.Trigger.AODEDMSet)
     objlist=[]
     for t,kset in tlist.items():
         for k in kset:

Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py

@@ -1225,43 +1225,6 @@ def addHLTNavigationToEDMList(flags, edmList, allDecisions, hypoDecisions):
             (typeName,    thisCollectionHLTNavEDMTargets, 'Steer'),
             (typeNameAux, thisCollectionHLTNavEDMTargets, 'Steer')])
 
-def addExtraCollectionsToEDMList(edmList, extraList):
-    """
-    Extend edmList with extraList, keeping track whether a completely new
-    collection is being added, or a dynamic variable is added to an existing collection.
-    The format of extraList is the same as those of TriggerHLTListRun3.
-    """
-    existing_collections = [(c[0].split("#")[1]).split(".")[0] for c in edmList]
-    for item in extraList:
-        colname = (item[0].split("#")[1]).split(".")[0]
-        if colname not in existing_collections:
-            # a new collection is added
-            edmList.append(item)
-            __log.info("added new item to Trigger EDM: {}".format(item))
-        else:
-            if "Aux." in item[0]:
-                # probably an extra dynamic variable is added
-                # new variables to add:
-                dynVars = (item[0].split("#")[1]).split(".")[1:]
-                # find the index of the existing item
-                existing_item_nr = [i for i,s in enumerate(edmList) if colname == (s[0].split("#")[1]).split(".")[0]]
-                if len(existing_item_nr) != 1:
-                    __log.error("Found {} existing edm items corresponding to new item {}, but it must be exactly one!".format(len(existing_item_nr), item))
-                # merge lists of variables
-                existing_dynVars = (edmList[existing_item_nr[0]][0].split("#")[1]).split(".")[1:]
-                dynVars.extend(existing_dynVars)
-                # remove duplicates:
-                dynVars = list(dict.fromkeys(dynVars))
-                newVars = '.'.join(dynVars)
-                typename = item[0].split("#")[0]
-                __log.info("old item in Trigger EDM: {}".format(edmList[existing_item_nr[0]]))
-                targets = edmList[existing_item_nr[0]][1]
-                signature = edmList[existing_item_nr[0]][2]
-                edmList.pop(existing_item_nr[0])
-                edmList.insert(existing_item_nr[0] , (typename + "#" + colname + "." + newVars, targets, signature))
-                __log.info("updated item in Trigger EDM: {}".format(edmList[existing_item_nr[0]]))
-            else:
-                # asking to add some collection which is already in the list - do nothing
-                pass
+
 
 

Trigger/TriggerCommon/TrigEDMConfig/python/testEDM.py

@@ -5,8 +5,9 @@ from AthenaCommon.Logging import logging
 log = logging.getLogger('testEDM')
 
 from TriggerEDM import (TriggerL2List, TriggerEFList, TriggerResultsList, TriggerResultsRun1List,
-                        TriggerLvl1List, TriggerIDTruth, TriggerHLTList)
+                        TriggerLvl1List, TriggerIDTruth, TriggerHLTList, _addExtraCollectionsToEDMList)
 from TriggerEDMRun2 import EDMDetails
+from TrigEDMConfig.TriggerEDMDefs import InViews
 import TriggerEDMRun1
 from CLIDComps.clidGenerator import clidGenerator
 cgen = clidGenerator("", False)
@@ -57,6 +58,48 @@ def main():
     if EDMDetail not in serializable_names_no_label:
       log.warning("EDMDetail for " + EDMDetail + " does not correspond to any name in TriggerList")
 
+  # Check EDM flag manipulation
+  dummyEDM = [
+    ('xAOD::A#HLT_A',                        'BS ESD', 'Steer', [InViews('SomeView1')]),
+    ('xAOD::AAuxContainer#HLT_AAux.',        'BS ESD', 'Steer'),
+    ('xAOD::B#HLT_B',                        'BS ESD', 'Steer'),
+    ('xAOD::BAuxContainer#HLT_BAux.DecOne.', 'BS ESD', 'Steer'),
+    ('xAOD::B#HLT_C',                        'BS ESD', 'Steer'),
+    ('xAOD::BAuxContainer#HLT_CAux.',        'BS ESD', 'Steer'),
+  ]
+
+  updateList = [
+    # Add new
+    ('xAOD::D#HLT_D',                                'BS ESD AODFULL', 'Steer', [InViews('SomeView2')]),
+    ('xAOD::DAuxContainer#HLT_DAux.',                'BS ESD AODFULL', 'Steer'),
+    # Add decorations & target
+    ('xAOD::AAuxContainer#HLT_AAux.DecTwo.DecThree', 'BS ESD', 'Steer'),
+    ('xAOD::B#HLT_B',                                'BS ESD AODFULL', 'Steer'),
+    ('xAOD::BAuxContainer#HLT_BAux.DecFour',         'BS ESD AODFULL', 'Steer'),
+    # Duplicate - leave untouched
+    ('xAOD::C#HLT_C',                                'BS ESD', 'Steer'),
+    ('xAOD::CAuxContainer#HLT_CAux.',                'BS ESD', 'Steer'),
+  ]
+
+  _addExtraCollectionsToEDMList(dummyEDM, updateList) # Note: Function updates dummyEDM in-place
+
+  expectedEDM = [
+    ('xAOD::A#HLT_A',                                'BS ESD',         'Steer', [InViews('SomeView1')]),
+    ('xAOD::AAuxContainer#HLT_AAux.DecTwo.DecThree', 'BS ESD',         'Steer'),
+    ('xAOD::B#HLT_B',                                'BS ESD AODFULL', 'Steer'),
+    ('xAOD::BAuxContainer#HLT_BAux.DecOne.DecFour',  'BS ESD AODFULL', 'Steer'),
+    ('xAOD::C#HLT_C',                                'BS ESD', 'Steer'),
+    ('xAOD::CAuxContainer#HLT_CAux.',                'BS ESD', 'Steer'),
+    ('xAOD::D#HLT_D',                                'BS ESD AODFULL', 'Steer', [InViews('SomeView2')]),
+    ('xAOD::DAuxContainer#HLT_DAux.',                'BS ESD AODFULL', 'Steer'),
+  ]
+
+  if (dummyEDM != expectedEDM):
+    log.error("There is a problem in _addExtraCollectionsToEDMList, expecting:")
+    log.error(expectedEDM)
+    log.error("Got:")
+    log.error(dummyEDM)
+
 if __name__ == "__main__":
   import sys
   sys.exit(main())

Trigger/TriggerCommon/TrigEDMConfig/python/testEDMRun3.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3, EDMDetailsRun3
+from TrigEDMConfig.TriggerEDMDefs import allowTruncation
 from TrigEDMConfig.TriggerEDM import AllowedOutputFormats
 from AthenaCommon.Logging import logging
 log = logging.getLogger('testEDMRun3')
@@ -18,7 +19,7 @@ def isCLIDDefined(typename):
 def dumpListToJson(fileName):
   from TrigEDMConfig.TriggerEDM import getTriggerEDMList
   import json
-  edmDict = dict([(fmt, getTriggerEDMList(fmt, 3)) for fmt in AllowedOutputFormats])
+  edmDict = dict([(fmt, getTriggerEDMList(flags=None, key=fmt, runVersion=3)) for fmt in AllowedOutputFormats])
   with open(fileName,'w') as f:
     json.dump(edmDict, f)
 
@@ -26,6 +27,7 @@ def dumpListToJson(fileName):
 def main():
   import re
   return_code = 0
+  found_allow_truncation = False
   serializable_names = []
   serializable_names_no_label = []
   #Check for duplicates
@@ -68,6 +70,17 @@ def main():
         log.error("unknown file type " + file_type + " for " + serializable_name)
         return_code = 1
 
+    # Check allowTuncation is only at the end
+    tags = edm[3] if len(edm) > 3 else None
+    allow_truncation_flag = False
+    if tags:
+      allow_truncation_flag = allowTruncation in tags
+      if allow_truncation_flag:
+        found_allow_truncation = True
+
+    if found_allow_truncation and not allow_truncation_flag:
+      log.error("All instances of 'allowTruncation' need to be at the END of the EDM serialisation list")
+
     serializable_names.append(serializable_name)
     serializable_names_no_label.append(serializable_name_no_label)
 

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py

@@ -347,7 +347,7 @@ def triggerBSOutputCfg(flags, hypos, offline=False):
     from TrigOutputHandling.TrigOutputHandlingConfig import TriggerEDMSerialiserToolCfg, StreamTagMakerToolCfg, TriggerBitsMakerToolCfg
 
     # Get list of all output collections for ByteStream (including DataScouting)
-    collectionsToBS = getRun3BSList(["BS"] + DataScoutingInfo.getAllDataScoutingIdentifiers())
+    collectionsToBS = getRun3BSList(flags, ["BS"] + DataScoutingInfo.getAllDataScoutingIdentifiers())
 
     # Tool serialising EDM objects to fill the HLT result
     serialiser = TriggerEDMSerialiserToolCfg(flags)
@@ -472,7 +472,7 @@ def triggerPOOLOutputCfg(flags):
                                      ( flags.Output.doWriteAOD, 'AOD', flags.Trigger.AODEDMSet)]:
         if not doit: continue
 
-        edmList = getTriggerEDMList(edmSet, flags.Trigger.EDMVersion, flags.Trigger.ExtraEDMList)
+        edmList = getTriggerEDMList(flags, key=edmSet)
 
         # Build the output ItemList
         itemsToRecord = []
@@ -503,7 +503,8 @@ def triggerPOOLOutputCfg(flags):
 def triggerMergeViewsCfg( flags, viewMakers ):
     """Configure the view merging algorithm"""
 
-    from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3, InViews
+    from TrigEDMConfig.TriggerEDMDefs import InViews
+    from TrigEDMConfig.TriggerEDM import getRawTriggerEDMList
 
     acc = ComponentAccumulator()
     mergingTool = CompFactory.HLTEDMCreator("ViewsMergingTool")
@@ -511,7 +512,7 @@ def triggerMergeViewsCfg( flags, viewMakers ):
                                        OutputTools = [mergingTool])
 
     # configure views merging
-    needMerging = [x for x in TriggerHLTListRun3 if len(x) >= 4 and
+    needMerging = [x for x in getRawTriggerEDMList(flags) if len(x) >= 4 and
                    any(isinstance(v, InViews) for v in x[3])]
     __log.info("These collections need merging: %s", " ".join([ c[0] for c in needMerging ]))
 
@@ -547,7 +548,8 @@ def triggerMergeViewsCfg( flags, viewMakers ):
 def triggerEDMGapFillerCfg( flags, edmSet, decObj=[], decObjHypoOut=[], extraInputs=[], extraOutputs=[] ):
     """Configure the EDM gap filler"""
 
-    from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3, Alias
+    from TrigEDMConfig.TriggerEDMDefs import Alias
+    from TrigEDMConfig.TriggerEDM import getRawTriggerEDMList
 
     # Ignore the following collections in the GapFiller. List of regular expressions
     # that are fully matched against the EDM entry ("type#key").
@@ -572,7 +574,7 @@ def triggerEDMGapFillerCfg( flags, edmSet, decObj=[], decObjHypoOut=[], extraInp
         re_ignore = [re.compile(x) for x in ignore]
 
         # scan the EDM
-        for el in TriggerHLTListRun3:
+        for el in getRawTriggerEDMList(flags):
             if not any([ outputType in el[1].split() for outputType in edmSet ]):
                 continue
             if any(ign.fullmatch(el[0]) for ign in re_ignore):
@@ -685,16 +687,18 @@ def triggerRunCfg( flags, menu=None ):
     viewMakers = collectViewMakers( HLTSteps )
 
     # Add HLT Navigation to EDM list
+    # TODO: DO NOT directly modify TriggerHLTListRun3
     from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3, addHLTNavigationToEDMList
     __log.info( "Number of EDM items before adding navigation: %d", len(TriggerHLTListRun3))
     addHLTNavigationToEDMList(flags, TriggerHLTListRun3, decObj, decObjHypoOut)
     __log.info( "Number of EDM items after adding navigation: %d", len(TriggerHLTListRun3))
 
     # Add Extra to EDM list
+    # TODO: DO NOT directly modify TriggerHLTListRun3
     if flags.Trigger.ExtraEDMList:
-        from TrigEDMConfig.TriggerEDMRun3 import addExtraCollectionsToEDMList
+        from TrigEDMConfig.TriggerEDM import _addExtraCollectionsToEDMList
         __log.info( "Adding extra collections to EDM: %s", str(flags.Trigger.ExtraEDMList))
-        addExtraCollectionsToEDMList(TriggerHLTListRun3, flags.Trigger.ExtraEDMList)
+        _addExtraCollectionsToEDMList(TriggerHLTListRun3, flags.Trigger.ExtraEDMList)
 
     # Configure output writing
     outputAcc, edmSet = triggerOutputCfg( flags, hypos )

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py

@@ -292,7 +292,7 @@ def createTriggerFlags(doTriggerRecoFlags):
                   help='list of EDM objects to be written to ESD')
 
     flags.addFlag('Trigger.ExtraEDMList', [],
-                  help='list of extra EDM objects to be stored (for testing)')
+                  help='list of extra EDM objects to be stored (for testing). Supported features: Add new items. Add extra decorations to existing Aux. Add additional output targets.')
 
     def __availableRecoMetadata(flags):
         systems = ['L1','HLT']

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py

@@ -161,8 +161,8 @@ def TriggerEDMCfg(flags):
         acc.merge(addToAOD(flags, edmDictToList(getLvl1AODList())))
 
     edmVersion = max(2, flags.Trigger.EDMVersion)
-    _TriggerESDList = getTriggerEDMList(flags.Trigger.ESDEDMSet, edmVersion, flags.Trigger.ExtraEDMList)
-    _TriggerAODList = getTriggerEDMList(flags.Trigger.AODEDMSet, edmVersion, flags.Trigger.ExtraEDMList)
+    _TriggerESDList = getTriggerEDMList(flags, key=flags.Trigger.ESDEDMSet, runVersion=edmVersion)
+    _TriggerAODList = getTriggerEDMList(flags, key=flags.Trigger.AODEDMSet, runVersion=edmVersion)
     log.debug("ESD EDM list: %s", _TriggerESDList)
     log.debug("AOD EDM list: %s", _TriggerAODList)
     
@@ -225,7 +225,7 @@ def Run2Run1NavigationSlimmingCfg(flags):
     from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
 
     if flags.Output.doWriteAOD:
-        _TriggerAODList = getTriggerEDMList(flags.Trigger.AODEDMSet,  flags.Trigger.EDMVersion)
+        _TriggerAODList = getTriggerEDMList(flags, key=flags.Trigger.AODEDMSet)
         thinningSvc = acc.getPrimaryAndMerge(TrigNavigationThinningSvcCfg(flags, 
                                                                           {'name' : 'HLTNav_StreamAOD',
                                                                            'mode' : 'cleanup_noreload', 
@@ -234,7 +234,7 @@ def Run2Run1NavigationSlimmingCfg(flags):
         acc.merge(OutputStreamCfg(flags, "AOD", trigNavThinningSvc = thinningSvc))
 
     if flags.Output.doWriteESD:
-        _TriggerESDList = getTriggerEDMList(flags.Trigger.ESDEDMSet,  flags.Trigger.EDMVersion)
+        _TriggerESDList = getTriggerEDMList(flags, key=flags.Trigger.ESDEDMSet)
         thinningSvc = acc.getPrimaryAndMerge(TrigNavigationThinningSvcCfg(flags,
                                                                           {'name' : 'HLTNav_StreamESD',
                                                                            'mode' : 'cleanup_noreload', 
@@ -325,7 +325,6 @@ def Run1xAODConversionCfg(flags):
     acc = ComponentAccumulator()
 
     log.info("Will configure Run 1 trigger EDM to xAOD conversion")
-    from TrigEDMConfig.TriggerEDM import getTriggerEDMList
     from TrigEDMConfig.TriggerEDM import getEFRun1BSList,getEFRun2EquivalentList,getL2Run1BSList,getL2Run2EquivalentList
 
     from TrkConfig.TrkParticleCreatorConfig import TrackParticleCreatorToolCfg
@@ -357,8 +356,8 @@ def Run1xAODConversionCfg(flags):
     acc.setPrivateTools(bstoxaodTool)
 
     # write the xAOD (Run-2) classes to the output
-    acc.merge(addToESD(flags, edmDictToList(getTriggerEDMList(flags.Trigger.ESDEDMSet, runVersion=2))))
-    acc.merge(addToAOD(flags, edmDictToList(getTriggerEDMList(flags.Trigger.AODEDMSet, runVersion=2))))
+    acc.merge(addToESD(flags, edmDictToList(getTriggerEDMList(flags, key=flags.Trigger.ESDEDMSet, runVersion=2))))
+    acc.merge(addToAOD(flags, edmDictToList(getTriggerEDMList(flags, key=flags.Trigger.AODEDMSet, runVersion=2))))
 
     return acc