Merge branch 'JiveXML_addTrigger' into 'main'

Add Trigger retrievers to TriggerRetrieversCfg (CA config) and merge CA in AlgoJiveXMLCfg

See merge request atlas/athena!68580

graphics/JiveXML/python/JiveXMLConfig.py

@@ -88,6 +88,15 @@ def getDataTypes(flags, haveRDO=False, readAOD=False):
     data_types += ["JiveXML::xAODTrackParticleRetriever/xAODTrackParticleRetriever"]
     data_types += ["JiveXML::xAODVertexRetriever/xAODVertexRetriever"]
 
+    if flags.Reco.EnableTrigger:
+        # Taken from TrigJiveXML_DataTypes.py
+        data_types += ["JiveXML::LVL1ResultRetriever/LVL1ResultRetriever"]
+        data_types += ["JiveXML::TriggerInfoRetriever/TriggerInfoRetriever"]
+        data_types += ["JiveXML::xAODEmTauROIRetriever/xAODEmTauROIRetriever"]
+        data_types += ["JiveXML::xAODJetROIRetriever/xAODJetROIRetriever"]
+        data_types += ["JiveXML::xAODMuonROIRetriever/xAODMuonROIRetriever"]
+        data_types += ["JiveXML::xAODTriggerTowerRetriever/xAODTriggerTowerRetriever"]
+
     return data_types
 
 
@@ -407,7 +416,45 @@ def xAODRetrieversCfg(flags):
 
 def TriggerRetrieversCfg(flags):
     result = ComponentAccumulator()
-    # TODO
+    if flags.Reco.EnableTrigger:
+        #--- LVL1 result from TrigDecision
+        result.addPublicTool(
+            CompFactory.JiveXML.LVL1ResultRetriever(
+                name="LVL1ResultRetriever"
+            )
+        )
+
+        #--- TriggerInfo (Etmiss, etc)
+        result.addPublicTool(
+            CompFactory.JiveXML.TriggerInfoRetriever(
+                name="TriggerInfoRetriever" 
+            )
+        )
+
+        # new xAOD retrievers
+        result.addPublicTool(
+            CompFactory.JiveXML.xAODEmTauROIRetriever(
+                name="xAODEmTauROIRetriever"
+            )
+        )
+
+        result.addPublicTool(
+            CompFactory.JiveXML.xAODJetROIRetriever(
+                name="xAODJetROIRetriever"
+            )
+        )
+
+        result.addPublicTool(
+            CompFactory.JiveXML.xAODMuonROIRetriever(
+                name="xAODMuonROIRetriever"
+            )
+        )
+
+        result.addPublicTool(
+            CompFactory.JiveXML.xAODTriggerTowerRetriever(
+                name="xAODTriggerTowerRetriever"
+            )
+        )
     return result
 
 def AlgoJiveXMLCfg(flags, name="MuonCombinePatternTool", **kwargs):
@@ -445,8 +492,7 @@ def AlgoJiveXMLCfg(flags, name="MuonCombinePatternTool", **kwargs):
 
     result.merge(xAODRetrieversCfg(flags))
 
-    #if flags.Trigger.doHLT: #FIXME - is this the right flag?
-    #result.merge(TriggerRetrieversCfg(flags))
+    result.merge(TriggerRetrieversCfg(flags))
 
     the_alg = CompFactory.JiveXML.AlgoJiveXML(name="AlgoJiveXML", **kwargs)
     result.addEventAlgo(the_alg, primary=True)