Merge branch 'EDMRun3_L2Muon' into 'master'

Adding L2Muon containers to trigger EDM, ATR-16944

See merge request atlas/athena!24689

Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py

@@ -142,6 +142,16 @@ TriggerHLTList = [
     ('xAOD::TrackParticleContainer#HLT_MSOnlyExtrapolatedMuons_FSTrackParticles',             'BS ESD AODFULL', 'Muon', 'inViews:MUFSViewRoI'),
     ('xAOD::TrackParticleAuxContainer#HLT_MSOnlyExtrapolatedMuons_FSTrackParticlesAux.',      'BS ESD AODFULL', 'Muon'),
 
+    #xAOD L2 muons (SA, CB, isolation)
+    ('xAOD::L2StandAloneMuonContainer#HLT_MuonL2SAInfo',        'BS ESD AODFULL', 'Muon', 'inViews:MUViewRoIs'),
+    ('xAOD::L2StandAloneMuonAuxContainer#HLT_MuonL2SAInfoAux.', 'BS ESD AODFULL', 'Muon'),
+
+    ('xAOD::L2CombinedMuonContainer#HLT_MuonL2CBInfo',          'BS ESD AODFULL', 'Muon', 'inViews:EMCombViewRoIs'),
+    ('xAOD::L2CombinedMuonAuxContainer#HLT_MuonL2CBInfoAux.',   'BS ESD AODFULL', 'Muon'),
+
+    ('xAOD::L2IsoMuonContainer#HLT_MuonL2ISInfo',               'BS ESD AODFULL', 'Muon', 'inViews:MUIsoViewRoIs'),
+    ('xAOD::L2IsoMuonAuxContainer#HLT_MuonL2ISInfoAux.',        'BS ESD AODFULL', 'Muon'),
+
 
     # Tau
 

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py

@@ -23,13 +23,13 @@ class muonNames(object):
     #for RoI and FS running. Other containers are 
     #produced in RoIs only.
 
-    self.L2SAName = "MuonL2SAInfo"
-    self.L2CBName = "MuonL2CBInfo"
+    self.L2SAName = recordable("HLT_MuonL2SAInfo")
+    self.L2CBName = recordable("HLT_MuonL2CBInfo")
     self.EFSAName = "Muons"
     self.EFCBName = "MuonsCB"
     self.EFCBOutInName = recordable("HLT_MuonsCBOutsideIn")
     self.EFCBInOutName = "HLT_MuonsCBInsideOut"
-    self.L2IsoMuonName = "MuonsL2ISInfo"
+    self.L2IsoMuonName = recordable("HLT_MuonL2ISInfo")
     self.EFIsoMuonName = "MuonsIso"
 
   def getNames(self, name):