diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index dd2d5b9501e7c3764294d0e130acfb3fb06128d1..596bcbc1612f2fd191afc7827dd26a974987a6a4 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -256,6 +256,12 @@ HLT_2j110_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J50: 1: 18 HLT_2j120_mb_afprec_afpdijet_L1CEP-CjJ50: eventCount: 0 +HLT_2j135_0eta240_j60_0eta240_L1J100: + eventCount: 2 + stepCounts: + 0: 2 + stepFeatures: + 0: 12 HLT_2j135_mb_afprec_afpdijet_L1CEP-CjJ60: eventCount: 0 HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_ExoticPTF0p0dR1p2_L1J100: @@ -292,8 +298,20 @@ HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J100: stepFeatures: 0: 5 1: 6 +HLT_2j180_0eta240_j80_0eta240_L1J100: + eventCount: 2 + stepCounts: + 0: 2 + stepFeatures: + 0: 12 HLT_2j20_mb_afprec_afpdijet_L1RD0_FILLED: eventCount: 0 +HLT_2j225_0eta240_j100_0eta240_L1J100: + eventCount: 1 + stepCounts: + 0: 1 + stepFeatures: + 0: 7 HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100: eventCount: 1 stepCounts: @@ -346,6 +364,42 @@ HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15: 0: 5 stepFeatures: 0: 5 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100: + eventCount: 0 + stepCounts: + 0: 5 + stepFeatures: + 0: 5 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 5 + stepFeatures: + 0: 5 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100: + eventCount: 0 + stepCounts: + 0: 5 + stepFeatures: + 0: 5 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 5 + stepFeatures: + 0: 5 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100: + eventCount: 0 + stepCounts: + 0: 5 + stepFeatures: + 0: 5 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 5 + stepFeatures: + 0: 5 HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100: eventCount: 1 stepCounts: @@ -978,6 +1032,24 @@ HLT_2mu6_noL2Comb_bJpsimumu_L12MU5VF: 2: 8 3: 5 4: 5 +HLT_3j100_L1J100: + eventCount: 1 + stepCounts: + 0: 1 + stepFeatures: + 0: 4 +HLT_3j125_L1J100: + eventCount: 1 + stepCounts: + 0: 1 + stepFeatures: + 0: 4 +HLT_3j150_L1J100: + eventCount: 1 + stepCounts: + 0: 1 + stepFeatures: + 0: 3 HLT_3j200_L1J100: eventCount: 1 stepCounts: @@ -1000,6 +1072,30 @@ HLT_3j200_pf_ftf_L1J100: stepFeatures: 0: 5 1: 3 +HLT_3j200_pf_ftf_presel3j100_L1J100: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + stepFeatures: + 0: 1 + 1: 3 +HLT_3j200_pf_ftf_presel3j125_L1J100: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + stepFeatures: + 0: 1 + 1: 3 +HLT_3j200_pf_ftf_presel3j150_L1J100: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + stepFeatures: + 0: 1 + 1: 3 HLT_3j20_pf_ftf_020jvt_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21: eventCount: 5 stepCounts: @@ -5602,6 +5698,18 @@ HLT_j135_L1J100: 0: 5 stepFeatures: 0: 9 +HLT_j135_a10_tc_em_nojcalib_L1J100: + eventCount: 5 + stepCounts: + 0: 5 + stepFeatures: + 0: 10 +HLT_j135_a10_tc_em_nojcalib_L1SC111-CJ15: + eventCount: 5 + stepCounts: + 0: 5 + stepFeatures: + 0: 10 HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49: eventCount: 0 HLT_j150_0eta290_020jvt_pf_ftf_boffperf_L1J100: @@ -5797,6 +5905,18 @@ HLT_j180_L1J100: 0: 5 stepFeatures: 0: 8 +HLT_j180_a10_tc_em_nojcalib_L1J100: + eventCount: 5 + stepCounts: + 0: 5 + stepFeatures: + 0: 9 +HLT_j180_a10_tc_em_nojcalib_L1SC111-CJ15: + eventCount: 5 + stepCounts: + 0: 5 + stepFeatures: + 0: 9 HLT_j200_0eta290_020jvt_pf_ftf_boffperf_L1J100: eventCount: 4 stepCounts: @@ -5913,6 +6033,18 @@ HLT_j225_L1J100: 0: 1 stepFeatures: 0: 3 +HLT_j225_a10_tc_em_nojcalib_L1J100: + eventCount: 5 + stepCounts: + 0: 5 + stepFeatures: + 0: 8 +HLT_j225_a10_tc_em_nojcalib_L1SC111-CJ15: + eventCount: 5 + stepCounts: + 0: 5 + stepFeatures: + 0: 8 HLT_j25_320eta490_L1RD0_FILLED: eventCount: 2 stepCounts: @@ -6349,6 +6481,54 @@ HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15: stepFeatures: 0: 5 1: 1 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 1 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 1 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 1 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 1 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 1 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 1 HLT_j420_a10sd_cssk_pf_jes_ftf_L1J100: eventCount: 1 stepCounts: @@ -6711,6 +6891,54 @@ HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: stepFeatures: 0: 5 1: 2 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1J100: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 2 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1SC111-CJ15: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 2 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1J100: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 2 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1SC111-CJ15: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 2 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 2 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CJ15: + eventCount: 1 + stepCounts: + 0: 5 + 1: 1 + stepFeatures: + 0: 5 + 1: 2 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100: eventCount: 1 stepCounts: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index bf81dd5537598b5e7c5cd6b3c3fed7f443ddf671..766be50cfd29618b7b2d0af5e209146af50f31a2 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -121,6 +121,8 @@ HLT_2j110_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J50: 0: 4 HLT_2j120_mb_afprec_afpdijet_L1CEP-CjJ50: eventCount: 0 +HLT_2j135_0eta240_j60_0eta240_L1J100: + eventCount: 0 HLT_2j135_mb_afprec_afpdijet_L1CEP-CjJ60: eventCount: 0 HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_ExoticPTF0p0dR1p2_L1J100: @@ -131,8 +133,12 @@ HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_ExoticPTF0p2dR1p2_L1J100: eventCount: 0 HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J100: eventCount: 0 +HLT_2j180_0eta240_j80_0eta240_L1J100: + eventCount: 0 HLT_2j20_mb_afprec_afpdijet_L1RD0_FILLED: eventCount: 0 +HLT_2j225_0eta240_j100_0eta240_L1J100: + eventCount: 0 HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100: eventCount: 0 HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_L1J100: @@ -147,6 +153,18 @@ HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100: eventCount: 0 HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15: eventCount: 0 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100: + eventCount: 0 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15: + eventCount: 0 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100: + eventCount: 0 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15: + eventCount: 0 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100: + eventCount: 0 +HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15: + eventCount: 0 HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100: eventCount: 0 HLT_2j330_a10t_lcw_jes_35smcINF_L1J100: @@ -418,12 +436,24 @@ HLT_2mu6_noL2Comb_bJpsimumu_L12MU5VF: stepFeatures: 0: 2 1: 2 +HLT_3j100_L1J100: + eventCount: 0 +HLT_3j125_L1J100: + eventCount: 0 +HLT_3j150_L1J100: + eventCount: 0 HLT_3j200_L1J100: eventCount: 0 HLT_3j200_ftf_L1J100: eventCount: 0 HLT_3j200_pf_ftf_L1J100: eventCount: 0 +HLT_3j200_pf_ftf_presel3j100_L1J100: + eventCount: 0 +HLT_3j200_pf_ftf_presel3j125_L1J100: + eventCount: 0 +HLT_3j200_pf_ftf_presel3j150_L1J100: + eventCount: 0 HLT_3j20_pf_ftf_020jvt_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21: eventCount: 0 HLT_3j35_0eta290_020jvt_pf_ftf_bdl1r70_j35_pf_ftf_0eta320_L14J15p0ETA25: @@ -1935,6 +1965,10 @@ HLT_j120_mb_afprec_afpdijet_L1AFP_A_AND_C_TOF_J50: eventCount: 0 HLT_j135_L1J100: eventCount: 0 +HLT_j135_a10_tc_em_nojcalib_L1J100: + eventCount: 0 +HLT_j135_a10_tc_em_nojcalib_L1SC111-CJ15: + eventCount: 0 HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49: eventCount: 0 HLT_j150_0eta290_020jvt_pf_ftf_boffperf_L1J100: @@ -2005,6 +2039,10 @@ HLT_j175_pf_ftf_preselj20_L1J50: 0: 4 HLT_j180_L1J100: eventCount: 0 +HLT_j180_a10_tc_em_nojcalib_L1J100: + eventCount: 0 +HLT_j180_a10_tc_em_nojcalib_L1SC111-CJ15: + eventCount: 0 HLT_j200_0eta290_020jvt_pf_ftf_boffperf_L1J100: eventCount: 0 HLT_j20_0eta290_020jvt_pf_ftf_boffperf_L1J15: @@ -2045,6 +2083,10 @@ HLT_j225_0eta290_pf_ftf_bdl1r85_L1J100: eventCount: 0 HLT_j225_L1J100: eventCount: 0 +HLT_j225_a10_tc_em_nojcalib_L1J100: + eventCount: 0 +HLT_j225_a10_tc_em_nojcalib_L1SC111-CJ15: + eventCount: 0 HLT_j25_320eta490_L1RD0_FILLED: eventCount: 3 stepCounts: @@ -2199,6 +2241,18 @@ HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100: eventCount: 0 HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15: eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100: + eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15: + eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100: + eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15: + eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100: + eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15: + eventCount: 0 HLT_j420_a10sd_cssk_pf_jes_ftf_L1J100: eventCount: 0 HLT_j420_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: @@ -2465,6 +2519,18 @@ HLT_j460_a10sd_cssk_pf_jes_ftf_L1J100: eventCount: 0 HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: eventCount: 0 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1J100: + eventCount: 0 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1SC111-CJ15: + eventCount: 0 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1J100: + eventCount: 0 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1SC111-CJ15: + eventCount: 0 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100: + eventCount: 0 +HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CJ15: + eventCount: 0 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100: eventCount: 0 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100: diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index f11025c7574aca19fa40d966e17e82a39e049c82..d7ea173b3cb1507e9262d05e536ead436f7253ab 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -543,6 +543,9 @@ TriggerHLTListRun3 = [ ('xAOD::JetContainer#HLT_AntiKt10LCTopoJets_nojcalib', 'BS ESD AODFULL', 'Jet'), ('xAOD::JetAuxContainer#HLT_AntiKt10LCTopoJets_nojcalibAux.'+JetVars, 'BS ESD AODFULL', 'Jet'), + ('xAOD::JetContainer#HLT_AntiKt10EMTopoJets_nojcalib', 'BS ESD AODFULL', 'Jet'), + ('xAOD::JetAuxContainer#HLT_AntiKt10EMTopoJets_nojcalibAux.'+JetVars, 'BS ESD AODFULL', 'Jet'), + ('xAOD::JetContainer#HLT_AntiKt10EMTopoRCJets_subjesIS', 'BS ESD AODFULL', 'Jet'), ('xAOD::JetAuxContainer#HLT_AntiKt10EMTopoRCJets_subjesISAux.'+JetVars, 'BS ESD AODFULL', 'Jet'), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py index 84ae7d7c9372470bd231c7e2971c214b41fafafc..090fbcf86eed5a1e58a55db79d61275fa19fc528 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py @@ -174,10 +174,13 @@ class JetChainConfiguration(ChainConfigurationBase): 'constitMod':'', 'trkopt':'notrk', } + ''' #Here you can set custom calibrations for large-R preselections. If you set to LCW you'll get an issue though, as the trigger expects the *same* topocluster collection to be used in the preselection and in the PFlow stage with tracking. Therefore this would need to be adapted, but it might not be so easy... + if preselRecoDict['recoAlg']=='a10': #Setting LC calibrations for large-R jets preselRecoDict['clusterCalib']='lcw' + ''' from .JetRecoConfiguration import interpretJetCalibDefault - preselRecoDict.update({'jetCalib':interpretJetCalibDefault(preselRecoDict)}) #Adding default calibration for corresponding chain + preselRecoDict.update({'jetCalib':interpretJetCalibDefault(preselRecoDict) if preselRecoDict['recoAlg']=='a4' else 'nojcalib'}) #Adding default calibration for corresponding chain from ..Menu.SignatureDicts import JetChainParts_Default preselCommonJetParts = dict(JetChainParts_Default) preselCommonJetParts.update(preselRecoDict) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 81e48b68c0dcaa5ea2efc62b6902dae7da65b8c2..a852367d7a98b11e283b02dc08a2e999be773091 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -429,6 +429,41 @@ def setupMenu(): ChainProp(name='HLT_j460_a10sd_lcw_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), ChainProp(name='HLT_j460_a10sd_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + #Large-R jets with preselections + ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + ChainProp(name='HLT_j135_a10_tc_em_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + ChainProp(name='HLT_j180_a10_tc_em_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + ChainProp(name='HLT_j225_a10_tc_em_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j135_a10_tc_em_nojcalib_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + ChainProp(name='HLT_j180_a10_tc_em_nojcalib_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + ChainProp(name='HLT_j225_a10_tc_em_nojcalib_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), + + ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + + #Other preselection chains + ChainProp(name='HLT_3j200_pf_ftf_presel3j100_L1J100', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_3j200_pf_ftf_presel3j125_L1J100', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_3j200_pf_ftf_presel3j150_L1J100', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_3j100_L1J100', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+SupportLegGroup), + ChainProp(name='HLT_3j125_L1J100', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+SupportLegGroup), + ChainProp(name='HLT_3j150_L1J100', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+SupportLegGroup), + ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), ChainProp(name='HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup), @@ -568,9 +603,12 @@ def setupMenu(): ChainProp(name='HLT_5j70_ftf_0eta240_L14J15', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+SupportLegGroup), - ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j135XXj60_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup + PrimaryLegGroup), - ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j180XXj80_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup + PrimaryLegGroup), - ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j225XXj100_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup + PrimaryLegGroup), + ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j135XXj60_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ), + ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j180XXj80_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ), + ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j225XXj100_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup), + ChainProp(name='HLT_2j135_0eta240_j60_0eta240_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ), + ChainProp(name='HLT_2j180_0eta240_j80_0eta240_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ), + ChainProp(name='HLT_2j225_0eta240_j100_0eta240_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ), #Adding testing chains for Tight,Medium,Loose preselections (ATR-23547) and also corresponding emtopo chain ChainProp(name='HLT_4j115_pf_ftf_presel4j55_L13J50', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+SupportLegGroup), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py index fca230c209978547e0475ec10a110c755b8ac826..de8ed7efb8c516befe9a4ba87b0f969da3a2083e 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py @@ -145,6 +145,7 @@ JetChainParts = { 'preselj135', #L1J50, #L1J100 'presel2j135', #L1J50, L1J100 'presel2j135XXj60', #L1J50, L1J100 + 'presel3j100', #L1J100 'presel4j33', #L13J50 'presel5j24', #L14J15 'presel6j36', #L14J15 @@ -153,6 +154,7 @@ JetChainParts = { 'preselj180', #L1J100 'presel2j180', #L1J100 'presel2j180XXj80', #L1J100 + 'presel3j125', #L1J100 'presel4j55', #L13J50 'presel5j35', #L14J15 'presel6j40', #L14J15 @@ -161,6 +163,7 @@ JetChainParts = { 'preselj225', #L1J100 'presel2j225', #L1J100 'presel2j225XXj100', #L1J100 + 'presel3j150', #L1J100 'presel4j85', #L13J50 'presel5j50', #L14J15 'presel6j45', #L14J15