From 83fc290e518c06ef0863671bafb8c3dd038e7193 Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Wed, 16 Dec 2020 18:42:09 +0000
Subject: [PATCH] Updating efficiency reference chains from HLT_j80_L1J15 to
HLT_j85_L1J20 in jet trigger monitoring tool
---
.../python/TrigJetMonitorAlgorithm.py | 23 ++--
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 66 +++++-----
.../share/ref_data_v1Dev_build.ref | 120 +++++++++---------
.../python/HLTMenuConfig/Menu/LS2_v1.py | 26 ++--
4 files changed, 118 insertions(+), 117 deletions(-)
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
index f118878e94c..1519f1a4e54 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
@@ -61,20 +61,21 @@ Chain2JetCollDict['MT'] = {
'HLT_j460_a10_lcw_subjes_L1J100' : 'HLT_AntiKt10LCTopoJets_subjes',
'HLT_j460_a10t_lcw_jes_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes',
'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes',
- 'HLT_j45_pf_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
- 'HLT_j45_pf_subjesgscIS_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf',
+ 'HLT_j45_pf_ftf_L1J15' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
+ 'HLT_j45_pf_subjesgscIS_ftf_L1J15' : 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf',
'HLT_j85_pf_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
- 'HLT_j45_pf_nojcalib_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf',
- 'HLT_j45_csskpf_nojcalib_ftf_L1J20' : 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf',
+ 'HLT_j45_pf_nojcalib_ftf_L1J15' : 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf',
+ 'HLT_j45_csskpf_nojcalib_ftf_L1J15' : 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf',
+ 'HLT_10j40_pf_subresjesgscIS_ftf_L14J15' : 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf',
}
TurnOnCurves['MT'] = { # ref chain, offline jet coll
- 'HLT_j420_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
- 'HLT_3j200_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
- 'HLT_j460_a10r_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
- 'HLT_j460_a10_lcw_subjes_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
- 'HLT_j460_a10t_lcw_jes_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
- 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
- 'HLT_j85_pf_ftf_L1J20' : ['HLT_j45_pf_ftf_L1J20','AntiKt4EMPFlowJets'],
+ 'HLT_j420_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
+ 'HLT_3j200_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
+ 'HLT_j460_a10r_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
+ 'HLT_j460_a10_lcw_subjes_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
+ 'HLT_j460_a10t_lcw_jes_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
+ 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : ['HLT_j85_L1J20','AntiKt4EMTopoJets'],
+ 'HLT_j85_pf_ftf_L1J20' : ['HLT_j45_pf_ftf_L1J15','AntiKt4EMPFlowJets'],
}
JetColls2Match['MT'] = {
'HLT_AntiKt4EMTopoJets_subjesIS' : 'AntiKt4EMPFlowJets',
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index c8d782b99bf..a03ea076bb9 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -1570,15 +1570,15 @@ HLT_j420_subresjesgscIS_ftf_L1J100:
0: 3
HLT_j45_L1J15:
eventCount: 0
-HLT_j45_csskpf_nojcalib_ftf_L1J20:
+HLT_j45_csskpf_nojcalib_ftf_L1J15:
eventCount: 17
stepCounts:
- 0: 19
+ 0: 20
1: 17
stepFeatures:
- 0: 19
+ 0: 20
1: 37
-HLT_j45_cssktc_nojcalib_L1J20:
+HLT_j45_cssktc_nojcalib_L1J15:
eventCount: 15
stepCounts:
0: 15
@@ -1592,75 +1592,75 @@ HLT_j45_ftf_L1J15:
stepFeatures:
0: 20
1: 55
-HLT_j45_ftf_preselj20_L1J20:
+HLT_j45_ftf_preselj20_L1J15:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
+ 0: 20
1: 55
-HLT_j45_nojcalib_L1J20:
+HLT_j45_nojcalib_L1J15:
eventCount: 17
stepCounts:
0: 17
stepFeatures:
0: 39
-HLT_j45_pf_ftf_010jvt_L1J20:
+HLT_j45_pf_ftf_010jvt_L1J15:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
+ 0: 20
1: 55
-HLT_j45_pf_ftf_020jvt_L1J20:
+HLT_j45_pf_ftf_020jvt_L1J15:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
+ 0: 20
1: 54
-HLT_j45_pf_ftf_050jvt_L1J20:
+HLT_j45_pf_ftf_050jvt_L1J15:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
+ 0: 20
1: 54
-HLT_j45_pf_ftf_L1J20:
+HLT_j45_pf_ftf_L1J15:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
+ 0: 20
1: 56
-HLT_j45_pf_ftf_preselj20_L1J20:
+HLT_j45_pf_ftf_preselj20_L1J15:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
+ 0: 20
1: 56
-HLT_j45_pf_nojcalib_ftf_L1J20:
+HLT_j45_pf_nojcalib_ftf_L1J15:
eventCount: 18
stepCounts:
- 0: 19
+ 0: 20
1: 18
stepFeatures:
- 0: 19
+ 0: 20
1: 49
-HLT_j45_pf_subjesgscIS_ftf_L1J20:
+HLT_j45_pf_subjesgscIS_ftf_L1J15:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
+ 0: 20
1: 52
HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
eventCount: 13
@@ -1682,19 +1682,19 @@ HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20:
0: 19
1: 49
2: 49
-HLT_j45_sktc_nojcalib_L1J20:
+HLT_j45_sktc_nojcalib_L1J15:
eventCount: 15
stepCounts:
0: 15
stepFeatures:
0: 26
-HLT_j45_subjesIS_ftf_preselj20_L1J20:
+HLT_j45_subjesIS_ftf_preselj20_L1J15:
eventCount: 19
stepCounts:
- 0: 19
+ 0: 20
1: 19
stepFeatures:
- 0: 19
+ 0: 20
1: 50
HLT_j45_subjesgscIS_ftf_011jvt_L1J15:
eventCount: 18
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index f55a38a8f6e..c1eabba4e8b 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -738,15 +738,15 @@ HLT_j45_L1J15:
0: 6
stepFeatures:
0: 6
-HLT_j45_csskpf_nojcalib_ftf_L1J20:
+HLT_j45_csskpf_nojcalib_ftf_L1J15:
eventCount: 3
stepCounts:
- 0: 5
+ 0: 7
1: 3
stepFeatures:
- 0: 5
+ 0: 7
1: 3
-HLT_j45_cssktc_nojcalib_L1J20:
+HLT_j45_cssktc_nojcalib_L1J15:
eventCount: 3
stepCounts:
0: 3
@@ -760,76 +760,76 @@ HLT_j45_ftf_L1J15:
stepFeatures:
0: 7
1: 7
-HLT_j45_ftf_preselj20_L1J20:
- eventCount: 5
+HLT_j45_ftf_preselj20_L1J15:
+ eventCount: 7
stepCounts:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 7
stepFeatures:
- 0: 5
- 1: 5
-HLT_j45_nojcalib_L1J20:
+ 0: 7
+ 1: 7
+HLT_j45_nojcalib_L1J15:
eventCount: 3
stepCounts:
0: 3
stepFeatures:
0: 3
-HLT_j45_pf_ftf_010jvt_L1J20:
- eventCount: 5
+HLT_j45_pf_ftf_010jvt_L1J15:
+ eventCount: 7
stepCounts:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 7
stepFeatures:
- 0: 5
- 1: 5
-HLT_j45_pf_ftf_020jvt_L1J20:
- eventCount: 5
+ 0: 7
+ 1: 7
+HLT_j45_pf_ftf_020jvt_L1J15:
+ eventCount: 7
stepCounts:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 7
stepFeatures:
- 0: 5
- 1: 5
-HLT_j45_pf_ftf_050jvt_L1J20:
- eventCount: 5
+ 0: 7
+ 1: 7
+HLT_j45_pf_ftf_050jvt_L1J15:
+ eventCount: 7
stepCounts:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 7
stepFeatures:
- 0: 5
- 1: 5
-HLT_j45_pf_ftf_L1J20:
- eventCount: 5
+ 0: 7
+ 1: 7
+HLT_j45_pf_ftf_L1J15:
+ eventCount: 7
stepCounts:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 7
stepFeatures:
- 0: 5
- 1: 5
-HLT_j45_pf_ftf_preselj20_L1J20:
- eventCount: 5
+ 0: 7
+ 1: 7
+HLT_j45_pf_ftf_preselj20_L1J15:
+ eventCount: 7
stepCounts:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 7
stepFeatures:
- 0: 5
- 1: 5
-HLT_j45_pf_nojcalib_ftf_L1J20:
- eventCount: 3
+ 0: 7
+ 1: 7
+HLT_j45_pf_nojcalib_ftf_L1J15:
+ eventCount: 4
stepCounts:
- 0: 5
- 1: 3
+ 0: 7
+ 1: 4
stepFeatures:
- 0: 5
- 1: 3
-HLT_j45_pf_subjesgscIS_ftf_L1J20:
- eventCount: 5
+ 0: 7
+ 1: 4
+HLT_j45_pf_subjesgscIS_ftf_L1J15:
+ eventCount: 6
stepCounts:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 6
stepFeatures:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 6
HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
eventCount: 0
stepCounts:
@@ -848,20 +848,20 @@ HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20:
0: 5
1: 5
2: 5
-HLT_j45_sktc_nojcalib_L1J20:
+HLT_j45_sktc_nojcalib_L1J15:
eventCount: 3
stepCounts:
0: 3
stepFeatures:
0: 3
-HLT_j45_subjesIS_ftf_preselj20_L1J20:
- eventCount: 5
+HLT_j45_subjesIS_ftf_preselj20_L1J15:
+ eventCount: 6
stepCounts:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 6
stepFeatures:
- 0: 5
- 1: 5
+ 0: 7
+ 1: 6
HLT_j45_subjesgscIS_ftf_011jvt_L1J15:
eventCount: 6
stepCounts:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 11510d8b227..57e8bdd7ebf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -236,21 +236,21 @@ def setupMenu():
ChainProp(name='HLT_j45_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j85_ftf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_pf_ftf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_pf_ftf_010jvt_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_pf_ftf_020jvt_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_pf_ftf_050jvt_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_pf_ftf_preselj20_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_preselj20_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_subjesIS_ftf_preselj20_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_pf_subjesgscIS_ftf_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_pf_ftf_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_pf_ftf_010jvt_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_pf_ftf_020jvt_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_pf_ftf_050jvt_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_pf_ftf_preselj20_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_ftf_preselj20_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_subjesIS_ftf_preselj20_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_pf_subjesgscIS_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j85_pf_ftf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_nojcalib_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_sktc_nojcalib_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_cssktc_nojcalib_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_pf_nojcalib_ftf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_csskpf_nojcalib_ftf_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_nojcalib_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_sktc_nojcalib_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_cssktc_nojcalib_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_pf_nojcalib_ftf_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_csskpf_nojcalib_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j260_320eta490_L1J20', groups=['Online',SingleJetGroup]),
--
GitLab