From 3ba6aaf8885843e19ef5182c97088f317a12f649 Mon Sep 17 00:00:00 2001
From: Savanna Marie Shaw <savanna.marie.shaw@cern.ch>
Date: Thu, 13 Feb 2020 14:29:45 +0100
Subject: [PATCH] Use muon specific track selection tool in muon triggers

Reecently a change to the track selection tool used in the muon triggers (in https://gitlab.cern.ch/atlas/athena/merge_requests/29539) was introduced that drastically reduced the efficiency for finding combined muons. Switching back to the default muon specific track selector tool which has more appropriate cuts on ID tracks needed for muon reconstruction.
---
 .../share/q221_RDOtoRDOTrig_mt1_build.ref     | 60 +++++++++----------
 .../python/HLTMenuConfig/Muon/MuonSetup.py    | 22 +------
 2 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index d34fdb17997..7ee09ed99c5 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -16,20 +16,20 @@ TrigSignatureMoniMT                                INFO HLT_2mu10_bJpsimumu_L12M
 TrigSignatureMoniMT                                INFO HLT_2mu10_bJpsimumu_L12MU10 decisions                    12        0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_2mu10_bUpsimumu_L12MU10   3         3         3         0         0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_2mu10_bUpsimumu_L12MU10 decisions                    12        0         0         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu14_L12MU10             3         3         3         2         2         0         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu14_L12MU10 decisions                       12        8         8         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu15_L12MU10             3         3         3         2         2         0         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu15_L12MU10 decisions                       12        8         8         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu4_bJpsimumu_L12MU4     4         4         4         2         1         0         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu4_bJpsimumu_L12MU4 decisions                    16        4         6         0         0
+TrigSignatureMoniMT                                INFO HLT_2mu14_L12MU10             3         3         3         2         2         1         0         1
+TrigSignatureMoniMT                                INFO HLT_2mu14_L12MU10 decisions                       12        8         8         4         0
+TrigSignatureMoniMT                                INFO HLT_2mu15_L12MU10             3         3         3         2         2         1         0         1
+TrigSignatureMoniMT                                INFO HLT_2mu15_L12MU10 decisions                       12        8         8         4         0
+TrigSignatureMoniMT                                INFO HLT_2mu4_bJpsimumu_L12MU4     4         4         4         2         1         1         1         1
+TrigSignatureMoniMT                                INFO HLT_2mu4_bJpsimumu_L12MU4 decisions                    16        4         6         4         1
 TrigSignatureMoniMT                                INFO HLT_2mu4_bUpsimumu_L12MU4     4         4         4         1         0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_2mu4_bUpsimumu_L12MU4 decisions                    16        1         0         0         0
 TrigSignatureMoniMT                                INFO HLT_2mu6Comb_L12MU6           4         4         4         3         0         0         0         3
 TrigSignatureMoniMT                                INFO HLT_2mu6Comb_L12MU6 decisions                     16        12        0         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu6_10invm70_L1MU6       10        10        4         3         3         0         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu6_10invm70_L1MU6 decisions                    16        12        18        0         0
-TrigSignatureMoniMT                                INFO HLT_2mu6_L12MU6               4         4         4         3         3         0         0         0
-TrigSignatureMoniMT                                INFO HLT_2mu6_L12MU6 decisions                         16        12        18        0         0
+TrigSignatureMoniMT                                INFO HLT_2mu6_10invm70_L1MU6       10        10        4         3         3         3         2         0
+TrigSignatureMoniMT                                INFO HLT_2mu6_10invm70_L1MU6 decisions                    16        12        18        16        2
+TrigSignatureMoniMT                                INFO HLT_2mu6_L12MU6               4         4         4         3         3         3         0         3
+TrigSignatureMoniMT                                INFO HLT_2mu6_L12MU6 decisions                         16        12        18        16        0
 TrigSignatureMoniMT                                INFO HLT_3j200_L1J100              3         3         0         0         0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_3j200_L1J100 decisions                        0         0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_3j200_L1J20               19        19        0         0         0         0         0         0
@@ -149,35 +149,35 @@ TrigSignatureMoniMT                                INFO HLT_mu10_lateMu_L1MU10 d
 TrigSignatureMoniMT                                INFO HLT_mu20_ivar_L1MU6           10        10        10        5         3         0         0         3
 TrigSignatureMoniMT                                INFO HLT_mu20_ivar_L1MU6 decisions                     14        6         3         0         0
 TrigSignatureMoniMT                                INFO HLT_mu24_idperf_L1MU20        8         8         6         6         5         5         0         5
-TrigSignatureMoniMT                                INFO HLT_mu24_idperf_L1MU20 decisions                    7         7         6         11        0
-TrigSignatureMoniMT                                INFO HLT_mu26_ivarmedium_L1MU20    8         8         8         5         4         1         0         0
-TrigSignatureMoniMT                                INFO HLT_mu26_ivarmedium_L1MU20 decisions                    10        6         5         1         0
-TrigSignatureMoniMT                                INFO HLT_mu28_ivarmedium_L1MU20    8         8         8         5         4         1         0         0
-TrigSignatureMoniMT                                INFO HLT_mu28_ivarmedium_L1MU20 decisions                    10        6         5         1         0
-TrigSignatureMoniMT                                INFO HLT_mu35_ivarmedium_L1MU20    8         8         8         5         4         1         0         0
-TrigSignatureMoniMT                                INFO HLT_mu35_ivarmedium_L1MU20 decisions                    10        6         5         1         0
-TrigSignatureMoniMT                                INFO HLT_mu50_L1MU20               8         8         8         5         1         0         0         0
-TrigSignatureMoniMT                                INFO HLT_mu50_L1MU20 decisions                         10        6         1         0         0
-TrigSignatureMoniMT                                INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU208         8         8         5         1         0         0         0
-TrigSignatureMoniMT                                INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions                    10        6         1         0         0
+TrigSignatureMoniMT                                INFO HLT_mu24_idperf_L1MU20 decisions                    7         7         6         6         0
+TrigSignatureMoniMT                                INFO HLT_mu26_ivarmedium_L1MU20    8         8         8         5         4         3         2         2
+TrigSignatureMoniMT                                INFO HLT_mu26_ivarmedium_L1MU20 decisions                    10        6         5         4         2
+TrigSignatureMoniMT                                INFO HLT_mu28_ivarmedium_L1MU20    8         8         8         5         4         3         2         2
+TrigSignatureMoniMT                                INFO HLT_mu28_ivarmedium_L1MU20 decisions                    10        6         5         3         2
+TrigSignatureMoniMT                                INFO HLT_mu35_ivarmedium_L1MU20    8         8         8         5         4         2         1         1
+TrigSignatureMoniMT                                INFO HLT_mu35_ivarmedium_L1MU20 decisions                    10        6         5         2         1
+TrigSignatureMoniMT                                INFO HLT_mu50_L1MU20               8         8         8         5         1         1         0         1
+TrigSignatureMoniMT                                INFO HLT_mu50_L1MU20 decisions                         10        6         1         1         0
+TrigSignatureMoniMT                                INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU208         8         8         5         1         1         1         1
+TrigSignatureMoniMT                                INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions                    10        6         1         1         1
 TrigSignatureMoniMT                                INFO HLT_mu60_0eta105_msonly_L1MU208         8         1         0         0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_mu60_0eta105_msonly_L1MU20 decisions                    2         0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_mu6Comb_L1MU6             10        10        10        10        0         0         0         10
 TrigSignatureMoniMT                                INFO HLT_mu6Comb_L1MU6 decisions                       14        13        0         0         0
-TrigSignatureMoniMT                                INFO HLT_mu6_L1MU6                 10        10        10        10        10        2         0         2
-TrigSignatureMoniMT                                INFO HLT_mu6_L1MU6 decisions                           14        13        16        2         0
+TrigSignatureMoniMT                                INFO HLT_mu6_L1MU6                 10        10        10        10        10        10        0         10
+TrigSignatureMoniMT                                INFO HLT_mu6_L1MU6 decisions                           14        13        16        15        0
 TrigSignatureMoniMT                                INFO HLT_mu6_idperf_L1MU6          10        10        10        10        10        10        0         10
-TrigSignatureMoniMT                                INFO HLT_mu6_idperf_L1MU6 decisions                    14        14        17        33        0
-TrigSignatureMoniMT                                INFO HLT_mu6_ivarmedium_L1MU6      10        10        10        10        10        2         1         1
-TrigSignatureMoniMT                                INFO HLT_mu6_ivarmedium_L1MU6 decisions                    14        13        16        2         1
+TrigSignatureMoniMT                                INFO HLT_mu6_idperf_L1MU6 decisions                    14        14        17        18        0
+TrigSignatureMoniMT                                INFO HLT_mu6_ivarmedium_L1MU6      10        10        10        10        10        10        7         7
+TrigSignatureMoniMT                                INFO HLT_mu6_ivarmedium_L1MU6 decisions                    14        13        16        15        7
 TrigSignatureMoniMT                                INFO HLT_mu6_msonly_L1MU6          10        10        10        0         10        0         0         10
 TrigSignatureMoniMT                                INFO HLT_mu6_msonly_L1MU6 decisions                    14        0         17        0         0
-TrigSignatureMoniMT                                INFO HLT_mu6_mu4_L12MU4            4         4         4         4         4         0         0         0
-TrigSignatureMoniMT                                INFO HLT_mu6_mu4_L12MU4 decisions                      8         8         12        0         0
+TrigSignatureMoniMT                                INFO HLT_mu6_mu4_L12MU4            4         4         4         4         4         4         0         4
+TrigSignatureMoniMT                                INFO HLT_mu6_mu4_L12MU4 decisions                      8         8         12        10        0
 TrigSignatureMoniMT                                INFO HLT_mu6fast_L1MU6             10        10        10        0         0         0         0         10
 TrigSignatureMoniMT                                INFO HLT_mu6fast_L1MU6 decisions                       14        0         0         0         0
-TrigSignatureMoniMT                                INFO HLT_mu6noL1_L1MU6             10        10        10        2         0         0         0         2
-TrigSignatureMoniMT                                INFO HLT_mu6noL1_L1MU6 decisions                       18        2         0         0         0
+TrigSignatureMoniMT                                INFO HLT_mu6noL1_L1MU6             10        10        10        10        0         0         0         10
+TrigSignatureMoniMT                                INFO HLT_mu6noL1_L1MU6 decisions                       18        14        0         0         0
 TrigSignatureMoniMT                                INFO HLT_mu80_msonly_3layersEC_L1MU208         8         8         0         0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions                    10        0         0         0         0
 TrigSignatureMoniMT                                INFO HLT_tau0_perf_ptonly_L1TAU100 0         0         0         0         0         0         0         0
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index 8782a9e41c9..7024c3f2538 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -548,16 +548,8 @@ def muEFCBRecoSequence( RoIs, name ):
   trackParticles = PTTrackParticles[-1]
 
   #Make InDetCandidates
-  from InDetTrackSelectorTool.InDetTrackSelectorToolConf import InDet__InDetDetailedTrackSelectorTool
-  from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigExtrapolator
-  from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummaryTool
-
-  InDetTrigTrackSelectorTool = InDet__InDetDetailedTrackSelectorTool("InDetTrigTrackSelectorTool",
-                                                                     TrackSummaryTool = InDetTrigTrackSummaryTool,
-                                                                     Extrapolator = InDetTrigExtrapolator,
-                                                                    )
   theIndetCandidateAlg = MuonCombinedInDetCandidateAlg("TrigMuonCombinedInDetCandidateAlg_"+name,TrackParticleLocation = [trackParticles],ForwardParticleLocation=trackParticles, 
-                                                       InDetCandidateLocation="InDetCandidates_"+name, TrackSelector = InDetTrigTrackSelectorTool)
+                                                       InDetCandidateLocation="InDetCandidates_"+name)
 
   from AthenaCommon.AppMgr import ToolSvc
   from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSCTConditionsSummaryTool
@@ -643,18 +635,8 @@ def muEFInsideOutRecoSequence(RoIs, name):
     trackParticles = PTTrackParticles[-1]
 
     #Make InDetCandidates
-
-    from InDetTrackSelectorTool.InDetTrackSelectorToolConf import InDet__InDetDetailedTrackSelectorTool
-    from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigExtrapolator
-    from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummaryTool
-
-    InDetTrigTrackSelectorTool = InDet__InDetDetailedTrackSelectorTool("InDetTrigTrackSelectorTool",
-                                                                       TrackSummaryTool = InDetTrigTrackSummaryTool,
-                                                                       Extrapolator = InDetTrigExtrapolator,
-                                                                      )
-
     theIndetCandidateAlg = MuonCombinedInDetCandidateAlg("TrigMuonCombinedInDetCandidateAlg_"+name,TrackParticleLocation = [trackParticles],ForwardParticleLocation=trackParticles, 
-                                                         InDetCandidateLocation="InDetCandidates_"+name, TrackSelector = InDetTrigTrackSelectorTool)
+                                                         InDetCandidateLocation="InDetCandidates_"+name)
     from AthenaCommon.AppMgr import ToolSvc
     from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSCTConditionsSummaryTool
     ToolSvc.CombinedMuonIDHoleSearch.SctSummaryTool = InDetTrigSCTConditionsSummaryTool
-- 
GitLab