From d60c24ff2aea76acf9a4739b46bb0671d5aee8fc Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Mon, 10 Feb 2020 15:52:53 +0000
Subject: [PATCH] Disable NN clustering when not running ID chains
---
.../src/SCT_FlaggedConditionTool.cxx | 8 ---
.../InDetRecExample/python/TrackingCommon.py | 3 +-
.../python/InDetTrigConfigConditions.py | 9 ++-
.../share/q221_RDOtoRDOTrig_mt1_build.ref | 60 +++++++++----------
.../TrigUpgradeTest/share/full_menu_build.ref | 24 ++++----
.../TriggerJobOpts/share/runHLT_standalone.py | 27 +++++----
.../python/HLTMenuConfig/Muon/MuonSetup.py | 22 ++++++-
7 files changed, 82 insertions(+), 71 deletions(-)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
index 333d74c08f3..594999b14fc 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
@@ -23,14 +23,6 @@ StatusCode SCT_FlaggedConditionTool::initialize() {
return StatusCode::FAILURE;
}
- // A dirty fix of a configuration of InDetTrigInDetSCT_FlaggedConditionTool for InDetTrigInDetSCT_ConditionsSummaryTool
- if (name().find("InDetTrigInDetSCT_FlaggedConditionTool")!=std::string::npos) {
- if (m_badIds.key()=="SCT_FlaggedCondData") {
- m_badIds = SG::ReadHandleKey<SCT_FlaggedCondData>("SCT_FlaggedCondData_TRIG");
- ATH_MSG_INFO("Key of SCT_FlaggedCondData is changed to SCT_FlaggedCondData_TRIG in " << name());
- }
- }
-
ATH_CHECK(m_badIds.initialize());
return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
index 429ee6d4d12..e79f4050362 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
@@ -247,7 +247,8 @@ def getPixelClusterNnCondAlg(**kwargs) :
from IOVDbSvc.CondDB import conddb
if not conddb.folderRequested('/PIXEL/PixelClustering/PixelClusNNCalib'):
# COOL binding
- conddb.addFolder("PIXEL_OFL","/PIXEL/PixelClustering/PixelClusNNCalib",className='CondAttrListCollection')
+ conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixelClustering/PixelClusNNCalib",
+ "/PIXEL/PixelClustering/PixelClusNNCalib",className='CondAttrListCollection')
kwargs=setDefaults(kwargs,
NetworkNames = nn_names,
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index f1346ea9857..4791c98887d 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -387,10 +387,9 @@ class SCT_ConditionsToolsSetup:
summaryToolWoFlagged = sct_ConditionsSummaryToolSetupWithoutFlagged.getTool()
condTools = []
for condToolHandle in self.summaryTool.ConditionsTools:
- condTool = condToolHandle.typeAndName
- if condTool not in condTools:
- if condTool != self.flaggedTool.getFullName():
- condTools.append(condTool)
+ if condToolHandle not in condTools:
+ if not "SCT_FlaggedConditionTool" in condToolHandle.getFullName():
+ condTools.append(condToolHandle)
summaryToolWoFlagged.ConditionsTools = condTools
if self._print: print (summaryToolWoFlagged)
return summaryToolWoFlagged
@@ -408,7 +407,7 @@ class SCT_ConditionsToolsSetup:
# Otherwise, SCT_FlaggedCondData created by SCT_Clusterization
if self._print: print (flaggedTool)
if not (flaggedTool.getFullName() in self.summaryTool.ConditionsTools):
- self.summaryTool.ConditionsTools+=[flaggedTool.getFullName()]
+ self.summaryTool.ConditionsTools+=[flaggedTool]
return flaggedTool
def initConfigTool(self, instanceName):
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index e3f942fb9f3..a492f31dffc 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 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_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_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 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_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_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
@@ -143,35 +143,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 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_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_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 10 0 10
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 14 13 16 15 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_idperf_L1MU6 10 10 10 10 10 10 0 10
-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_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_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 4 0 4
-TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 8 8 12 10 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_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 10 0 0 0 10
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 18 14 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_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/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 25be2958fc4..d71ae0505e0 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -3,7 +3,7 @@ TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15V
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 20 20 13 13 13 0 0 13
-TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 decisions 46 256 85 0 0
+TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 decisions 46 246 85 0 0
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH 20 20 0 0 0 0 0 0
@@ -51,7 +51,7 @@ TrigSignatureMoniMT INFO HLT_costmonitor_CostMon
TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM24VHI 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM24VHI decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI decisions 1 6 0 0 0
+TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI decisions 1 8 0 0 0
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM24VHI 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM24VHI decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM24VHI 20 20 0 0 0 0 0 0
@@ -59,19 +59,19 @@ TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM24VH
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU1020 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 20 20 15 13 13 0 0 13
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 48 256 85 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 decisions 48 246 85 0 0
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 20 20 13 12 12 0 0 12
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 41 236 47 0 0
+TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 decisions 41 230 47 0 0
TrigSignatureMoniMT INFO HLT_e5_lhloose_L1EM3 20 20 10 9 9 0 0 0
-TrigSignatureMoniMT INFO HLT_e5_lhloose_L1EM3 decisions 15 77 28 0 0
+TrigSignatureMoniMT INFO HLT_e5_lhloose_L1EM3 decisions 15 76 28 0 0
TrigSignatureMoniMT INFO HLT_e5_lhmedium_L1EM3 20 20 9 8 8 0 0 0
-TrigSignatureMoniMT INFO HLT_e5_lhmedium_L1EM3 decisions 13 75 27 0 0
+TrigSignatureMoniMT INFO HLT_e5_lhmedium_L1EM3 decisions 13 74 27 0 0
TrigSignatureMoniMT INFO HLT_e5_lhtight_L1EM3 20 20 9 8 8 0 0 0
-TrigSignatureMoniMT INFO HLT_e5_lhtight_L1EM3 decisions 13 75 27 0 0
+TrigSignatureMoniMT INFO HLT_e5_lhtight_L1EM3 decisions 13 74 27 0 0
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM24VHI 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM24VHI decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 20 20 13 12 11 0 0 11
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 26 167 21 0 0
+TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 decisions 26 162 21 0 0
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_g140_loose_L1EM24VHI 20 20 0 0 0 0 0 0
@@ -114,8 +114,8 @@ TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 decisions 6 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 20 20 4 0 0 0 0 4
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 decisions 4 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 20 20 6 0 0 0 0 6
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 decisions 6 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 20 20 7 0 0 0 0 7
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 decisions 7 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J2020 20 5 5 5 0 0 5
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 decisions 5 5 5 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J2020 20 5 5 5 0 0 5
@@ -244,7 +244,7 @@ TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10
TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 decisions 16 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 20 20 2 0 0 0 0 2
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 decisions 2 0 0 0 0
-TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 20 20 7 0 0 0 0 7
-TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 decisions 7 0 0 0 0
+TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 20 20 8 0 0 0 0 8
+TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 decisions 8 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 decisions 0 0 0 0 0
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 1e093f67311..3e0425ff1f3 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -363,6 +363,20 @@ if TriggerFlags.doMuon():
include ("MuonRecExample/MuonRecLoadTools.py")
+# ---------------------------------------------------------------
+# ID conditions
+# ---------------------------------------------------------------
+
+if TriggerFlags.doID:
+ from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
+ InDetTrigFlags.doPixelClusterSplitting = False
+
+ # PixelLorentzAngleSvc and SCTLorentzAngleSvc
+ from AthenaCommon.Include import include
+ include("InDetRecExample/InDetRecConditionsAccess.py")
+
+
+
# ----------------------------------------------------------------
# Pool input
# ----------------------------------------------------------------
@@ -483,19 +497,6 @@ if not opt.createHLTMenuExternally:
-# ---------------------------------------------------------------
-# ID conditions
-# ---------------------------------------------------------------
-
-if TriggerFlags.doID:
- from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
- InDetTrigFlags.doPixelClusterSplitting = False
-
- # PixelLorentzAngleSvc and SCTLorentzAngleSvc
- from AthenaCommon.Include import include
- include("InDetRecExample/InDetRecConditionsAccess.py")
-
-
# ---------------------------------------------------------------
# Monitoring
# ---------------------------------------------------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index c6f8f34eaa0..62a89ff13f7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -538,8 +538,16 @@ 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)
+ InDetCandidateLocation="InDetCandidates_"+name, TrackSelector = InDetTrigTrackSelectorTool)
#MS ID combination
candidatesName = "MuonCandidates"
@@ -621,8 +629,18 @@ 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)
+ InDetCandidateLocation="InDetCandidates_"+name, TrackSelector = InDetTrigTrackSelectorTool)
efAlgs.append(theIndetCandidateAlg)
--
GitLab