Add extra inputs and outputs to legacy navigation steering

Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtrigger.py

@@ -147,9 +147,12 @@ for i in outSequence.getAllChildren():
         alg = xAODMaker__TrigDecisionCnvAlg()
         alg.AODKey = "TrigDecision"
         alg.xAODKey = "xTrigDecision"
+        alg.ExtraOutputs = [('xAOD::TrigDecision','StoreGateSvc+xTrigDecision')]
         topSequence.insert(idx+1, alg)
         from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__TrigNavigationCnvAlg
-        topSequence.insert(idx+2, xAODMaker__TrigNavigationCnvAlg())
+        trigNavCnv = xAODMaker__TrigNavigationCnvAlg()
+        trigNavCnv.ExtraOutputs = [('xAOD::TrigNavigation','StoreGateSvc+TrigNavigation')]
+        topSequence.insert(idx+2, trigNavCnv)
         _TriggerESDList = {}
         _TriggerAODList = {}
         from TrigEDMConfig.TriggerEDM import getTriggerEDMList

Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py

@@ -141,6 +141,7 @@ class WritexAODTrigDecision ( object ) :
 
         from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__TrigDecisionCnvAlg
         alg = xAODMaker__TrigDecisionCnvAlg()
+        alg.ExtraOutputs = [('xAOD::TrigDecision','StoreGateSvc+xTrigDecision')]
 
         # In order for the conversion to work we need to setup the TrigDecisionTool such that it uses the old decision
         ToolSvc.TrigDecisionTool.UseAODDecision = True
@@ -154,7 +155,9 @@ class WritexAODTrigDecision ( object ) :
         TopAlg += alg
         
         from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__TrigNavigationCnvAlg
-        TopAlg += xAODMaker__TrigNavigationCnvAlg()
+        navAlg = xAODMaker__TrigNavigationCnvAlg()
+        navAlg.ExtraOutputs = [('xAOD::TrigNavigation','StoreGateSvc+TrigNavigation')]
+        TopAlg += navAlg
 
         log.info('TrigDecision writing to xAOD enabled')
 

Trigger/TrigEvent/TrigNavTools/python/TrigNavToolsConfig.py

@@ -45,6 +45,7 @@ def navigationSlimming( config ):
   if 'xAOD' in config:
     ThinTool.ResultKey=''
     ThinTool.xAODNavigationKey=config['result']
+    ThinTool.ExtraInputs = [('xAOD::TrigNavigation','StoreGateSvc+TrigNavigation')]
   
   if 'result' in config:
     ThinTool.ResultKey=config['result']

Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py

@@ -501,6 +501,7 @@ class HLTTriggerResultGetter(Configured):
                                                           'features':edmlist})
             tHLT.ActInPlace=True
             slimmerHLT.ThinningTool = tHLT
+            slimmerHLT.ExtraInputs = [('xAOD::TrigNavigation','StoreGateSvc+TrigNavigation')]
             topSequence += slimmerHLT
             log.info("Configured slimming of HLT")
             print(slimmerHLT.ThinningTool)  # noqa: ATL901