diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py index f118878e94cc0a0c11ff95a6c83c121f904b6262..1519f1a4e54ea744c4f49c0c93b7b0074da933be 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 bf5afbb2008a5966f52bfa9451013d1c662be43c..3d09ef19cbbe49620dbe4e2ff277e36c281d67cd 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 38fdc9c32d7d7874e2252f92fde1e95a36798229..571575bba8b21bcd209ca1dee45c2257cb1f3f7f 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 c33b57793af8dd4dbee1d3a4b2d3ffb88b7ed39c..1821f9279060881a01c797833c7af6d69d52d729 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]),