Merge branch 'dev_stelios' into 'main'

Updates for DAOD_MUON1

See merge request !68426

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MUON1.py

@@ -382,7 +382,7 @@ def MUON1Cfg(ConfigFlags):
     # Trigger content
     MUON1SlimmingHelper.IncludeTriggerNavigation = False
     MUON1SlimmingHelper.IncludeJetTriggerContent = False
-    MUON1SlimmingHelper.IncludeMuonTriggerContent = False
+    MUON1SlimmingHelper.IncludeMuonTriggerContent = True
     MUON1SlimmingHelper.IncludeEGammaTriggerContent = False
     MUON1SlimmingHelper.IncludeJetTauEtMissTriggerContent = False
     MUON1SlimmingHelper.IncludeTauTriggerContent = False

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MuonTriggerContent.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 MuonTriggerContent = [
 "HLT_xAOD__MuonContainer_MuonEFInfo",
-"HLT_xAOD__MuonContainer_MuonEFInfoAux.pt.eta.phi.muonType.author.inDetTrackParticleLink",
+"HLT_xAOD__MuonContainer_MuonEFInfoAux.",
+"HLT_xAOD__MuonContainer_MuonEFInfo_FullScan",
+"HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAux.",
 "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFID",
 "HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFIDAux.",
-"HLT_xAOD__MuonContainer_MuonEFInfo_FullScan",
-"HLT_xAOD__MuonContainer_MuonEFInfo_FullScanAux.pt.eta.phi.muonType.author.inDetTrackParticleLink",
-"LVL1MuonRoIs",
-"LVL1MuonRoIsAux."
+"HLT_Muons_RoI",   "HLT_Muons_RoIAux.",
+"HLT_MuonsIso",    "HLT_MuonsIsoAux.",
+"HLT_MuonsCB_RoI", "HLT_MuonsCB_RoIAux.",
+"HLT_MuonsCB_LRT", "HLT_MuonsCB_LRTAux.",
+"HLT_Muons_FS",    "HLT_Muons_FSAux.",
+"HLT_MuonsCB_FS",  "HLT_MuonsCB_FSAux.",
+"LVL1MuonRoIs",    "LVL1MuonRoIsAux.",
 ]
+