separated tracks for muons and electrons

Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py

@@ -53,7 +53,7 @@ TriggerHLTList = [
     ('xAOD::TrigCompositeContainer#L1MET',                'BS ESD AODFULL AODSLIM', 'Steer'),
     ('xAOD::TrigCompositeContainer#L1J',                  'BS ESD AODFULL AODSLIM', 'Steer'),
 
-
+    # Egamma
 
 
     ('xAOD::TrigEMClusterContainer#HLT_L2CaloEMClusters',           'BS ESD AODFULL', 'Egamma', 'inViews:EMCaloViews'), # last arg specifies in which view container the fragments are, look into the proprty of View maker alg for it
@@ -63,9 +63,17 @@ TriggerHLTList = [
     ('xAOD::TrigElectronContainer#HLT_L2Electrons',                 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),
     ('xAOD::TrigElectronAuxContainer#HLT_L2ElectronsAux.',          'BS ESD AODFULL', 'Egamma'),
 
-    # crashesdds in finalisation when enabled
-    ('xAOD::TrackParticleContainer#HLT_xAODTracks',                 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),
-    ('xAOD::TrackParticleAuxContainer#HLT_xAODTracksAux.',          'BS ESD AODFULL', 'Egamma'),
+    ('xAOD::TrackParticleContainer#HLT_xAODTracks_Electron',                 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),
+    ('xAOD::TrackParticleAuxContainer#HLT_xAODTracks_ElectronAux.',          'BS ESD AODFULL', 'Egamma'),
+
+
+    # Muon
+
+    ('xAOD::TrackParticleContainer#HLT_xAODTracks_Muon',                 'BS ESD AODFULL', 'Muon', 'inViews:EMCombViewRoIs'),
+    ('xAOD::TrackParticleAuxContainer#HLT_xAODTracks_MuonAux.',          'BS ESD AODFULL', 'Muon'),
+
+    ('xAOD::TrackParticleContainer#HLT_xAODTracks_MuonFS',                 'BS ESD AODFULL', 'Muon', 'inViews:MUCBFSViews'),
+    ('xAOD::TrackParticleAuxContainer#HLT_xAODTracks_MuonFSAux.',          'BS ESD AODFULL', 'Muon'),
 
 
     ('EventInfo#ByteStreamEventInfo',              'ESD', 'Misc'),

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/InDetSetup.py

@@ -13,9 +13,13 @@ class InDetCacheNames:
   PixRDOCacheKey     = "PixRDOCache"
 
 
-def makeInDetAlgs( whichSignature='' ):
+def makeInDetAlgs( whichSignature='', separateTrackParticleCreator='' ):
   #If signature specified add suffix to the algorithms
   signature =  "_" + whichSignature if whichSignature else ''
+  if signature != "" and separateTrackParticleCreator == "":
+    separateTrackParticleCreator = signature
+    
+    
 
 
   eventAlgs = []
@@ -249,11 +253,11 @@ def makeInDetAlgs( whichSignature='' ):
   from TrigInDetConf.TrigInDetPostTools import  InDetTrigParticleCreatorToolFTF
   from TrigEDMConfig.TriggerEDMRun3 import recordable
   from InDetTrigParticleCreation.InDetTrigParticleCreationConf import InDet__TrigTrackingxAODCnvMT
-  theTrackParticleCreatorAlg = InDet__TrigTrackingxAODCnvMT(name = "InDetTrigTrackParticleCreatorAlg" + signature,
-                                                           doIBLresidual = False,
-                                                           TrackName = "TrigFastTrackFinder_Tracks",
-                                                           TrackParticlesName = recordable("HLT_xAODTracks"),
-                                                           ParticleCreatorTool = InDetTrigParticleCreatorToolFTF)
+  theTrackParticleCreatorAlg = InDet__TrigTrackingxAODCnvMT(name = "InDetTrigTrackParticleCreatorAlg" + separateTrackParticleCreator,
+                                                            doIBLresidual = False,
+                                                            TrackName = "TrigFastTrackFinder_Tracks",
+                                                            TrackParticlesName = recordable("HLT_xAODTracks" + separateTrackParticleCreator),
+                                                            ParticleCreatorTool = InDetTrigParticleCreatorToolFTF)
   theTrackParticleCreatorAlg.roiCollectionName = "EMViewRoIs"
   viewAlgs.append(theTrackParticleCreatorAlg)
 

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py

@@ -15,7 +15,7 @@ def electronSequence(ConfigFlags):
     """ second step:  tracking....."""
     
     from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
-    (viewAlgs, eventAlgs) = makeInDetAlgs()
+    (viewAlgs, eventAlgs) = makeInDetAlgs( separateTrackParticleCreator="_Electron")
     from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
 
     theFTF = TrigFastTrackFinder_eGamma()
@@ -32,7 +32,7 @@ def electronSequence(ConfigFlags):
     
     TrackParticlesName = ""
     for viewAlg in viewAlgs:
-        if viewAlg.name() == "InDetTrigTrackParticleCreatorAlg":
+        if "InDetTrigTrackParticleCreatorAlg" in viewAlg.name():
             TrackParticlesName = viewAlg.TrackParticlesName
       
       

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

@@ -8,7 +8,7 @@ muFastInfo = "MuonL2SAInfo"
 muCombInfo = "MuonL2CBInfo"
 muEFSAInfo = "Muons"
 muL2ISInfo = "MuonL2ISInfo"
-TrackParticlesName = recordable("HLT_xAODTracks")
+TrackParticlesName = recordable("HLT_xAODTracks_Muon")
 
 ### ==================== Data prepartion needed for the EF and L2 SA ==================== ###
 def makeMuonPrepDataAlgs(forFullScan=False):
@@ -340,7 +340,7 @@ def muCombRecoSequence( RoIs ):
   ### Define input data of Inner Detector algorithms  ###
   ### and Define EventViewNodes to run the algorithms ###
   from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
-  (viewAlgs, eventAlgs) = makeInDetAlgs()
+  (viewAlgs, eventAlgs) = makeInDetAlgs(separateTrackParticleCreator="_Muon")
 
   from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_Muon
   theFTF_Muon = TrigFastTrackFinder_Muon()
@@ -352,7 +352,7 @@ def muCombRecoSequence( RoIs ):
   ViewVerify = CfgMgr.AthViews__ViewDataVerifier("muFastViewDataVerifier")
   ViewVerify.DataObjects = [('xAOD::L2StandAloneMuonContainer','StoreGateSvc+'+muFastInfo)]
   viewAlgs.append(ViewVerify)
-
+  global TrackParticlesName
   #TrackParticlesName = ""
   for viewAlg in viewAlgs:
       muCombRecoSequence += viewAlg
@@ -378,7 +378,7 @@ def muCombRecoSequence( RoIs ):
 
 
 def l2muisoRecoSequence( RoIs ):
-
+  global TrackParticlesName
   import AthenaCommon.CfgMgr as CfgMgr
   from AthenaCommon.CFElements import parOR