diff --git a/Control/AthViews/test/ViewCollectionMerge_test.txt b/Control/AthViews/test/ViewCollectionMerge_test.txt old mode 100755 new mode 100644 diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py index 23504bbe97dd23bf5bf1ef74b4b79dae1b81f4ea..076d84525b5f6073ab5c0945d2f8d883215b0511 100644 --- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py +++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py @@ -212,6 +212,7 @@ class EFBMuMuXFex_FTK (EFBMuMuXFex_1): # FTK self.DoFTK = True + self.TrackCollection = "InDetTrigTrackingxAODCnv_BeamSpot_FTK"