Merge branch '24.0-fix-daod-navigation' into '24.0'

[ATR-29141] Fix DAOD_L1CALO production at T0 with data24

See merge request atlas/athena!70538

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/CompulsoryContent.py

@@ -13,9 +13,6 @@ CompulsoryContent = [
 CompulsoryTriggerNavigation = [
 'xAOD::TrigNavigation#*',
 'xAOD::TrigNavigationAuxInfo#*',
-# Run 3 navigation:
-'xAOD::TrigCompositeContainer#HLTNav*',
-'xAOD::TrigCompositeAuxContainer#HLTNav*'
 ]
 
 # This accounts for AOD content that must be kept but which is partially expressed

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py

@@ -300,8 +300,16 @@ class SlimmingHelper:
                                 self.FinalItemList.append(item)
 
                 if (triggerContent and self.IncludeTriggerNavigation):
+                        # Run2
                         for item in CompulsoryTriggerNavigation:
                                 self.FinalItemList.append(item)
+                        # Run3
+                        from TrigDecisionTool.TrigDecisionToolConfig import possible_keys
+                        for item in possible_keys:
+                                if item == "HLTNav_Summary": # This is not a compact navigation summary collection, unlike the others in this list
+                                        continue
+                                self.FinalItemList.append('xAOD::TrigCompositeContainer#'+item)
+                                self.FinalItemList.append('xAOD::TrigCompositeAuxContainer#'+item+'Aux.')
 
                 # Add non-xAOD and on-the-fly content (not covered by smart slimming so no expansion)
                 badItemsWildcards = []