From 2f6be6c07729ebf93c9339646f195915d22e5433 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Tue, 27 Mar 2018 15:59:32 +0000
Subject: [PATCH] Merge branch '21-0-bag-Ftk' into '21.0'
Bug-fix for 0 ftk tracks in TrigEFBMuMuXFex
See merge request atlas/athena!9880
(cherry picked from commit 4dff517f805d54f133b3a98b65fe7a1211f752e3)
e4c01883 The bud has fixed.
---
Control/AthViews/test/ViewCollectionMerge_test.txt | 0
.../TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py | 1 +
2 files changed, 1 insertion(+)
mode change 100755 => 100644 Control/AthViews/test/ViewCollectionMerge_test.txt
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 23504bbe97dd..076d84525b5f 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"
--
GitLab