diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 1c48b6daf6fc81979a43eb58d13571f38abae22f..3998ac5c287fe350278c1088370d8dd2a53ddc89 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -1494,7 +1494,7 @@ HLT_j45_ftf_L1J15: stepFeatures: 0: 20 1: 54 -HLT_j45_ftf_preselj45_L1J20: +HLT_j45_ftf_preselj20_L1J20: eventCount: 19 stepCounts: 0: 19 @@ -1516,7 +1516,7 @@ HLT_j45_pf_ftf_L1J20: stepFeatures: 0: 19 1: 56 -HLT_j45_pf_ftf_preselj45_L1J20: +HLT_j45_pf_ftf_preselj20_L1J20: eventCount: 19 stepCounts: 0: 19 @@ -1566,7 +1566,7 @@ HLT_j45_sktc_nojcalib_L1J20: 0: 15 stepFeatures: 0: 26 -HLT_j45_subjesIS_ftf_preselj45_L1J20: +HLT_j45_subjesIS_ftf_preselj20_L1J20: eventCount: 19 stepCounts: 0: 19 diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 4a0b0fb8a4f79a708e67221d65ea58f016935063..108000117f7285e816bd7603decaef8a7c056c4d 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -716,7 +716,7 @@ HLT_j45_ftf_L1J15: stepFeatures: 0: 7 1: 7 -HLT_j45_ftf_preselj45_L1J20: +HLT_j45_ftf_preselj20_L1J20: eventCount: 5 stepCounts: 0: 5 @@ -738,7 +738,7 @@ HLT_j45_pf_ftf_L1J20: stepFeatures: 0: 5 1: 5 -HLT_j45_pf_ftf_preselj45_L1J20: +HLT_j45_pf_ftf_preselj20_L1J20: eventCount: 5 stepCounts: 0: 5 @@ -786,7 +786,7 @@ HLT_j45_sktc_nojcalib_L1J20: 0: 3 stepFeatures: 0: 3 -HLT_j45_subjesIS_ftf_preselj45_L1J20: +HLT_j45_subjesIS_ftf_preselj20_L1J20: eventCount: 5 stepCounts: 0: 5 diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py index 41b77d34c2f90bfde544ce78ae02ed1bfc89b802..cda41f8bb6545fc8f979844ef8119e9ffa7035dc 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py @@ -68,7 +68,7 @@ class JetChainConfiguration(ChainConfigurationBase): if self.recoDict["trkpresel"]=="nopresel": clustersKey, caloRecoStep = self.getJetCaloRecoChainStep() chainSteps.append( caloRecoStep ) - elif self.recoDict["trkpresel"]=="preselj45": + else: clustersKey, jetPreselStep = self.getJetCaloPreselChainStep() chainSteps.append( jetPreselStep ) jetCollectionName, jetTrackingHypoStep = self.getJetTrackingHypoChainStep(clustersKey) @@ -133,6 +133,10 @@ class JetChainConfiguration(ChainConfigurationBase): 'trkpresel': 'nopresel' } preselJetParts = dict(preselRecoDict) + preselParts = self.recoDict["trkpresel"].split('j') + multiplicity = preselParts[0].split('presel')[1] if preselParts[0] != 'presel' else '1' + threshold = preselParts[1] + chainPartName = multiplicity+'j'+threshold if multiplicity != '1' else 'j'+threshold preselJetParts.update( {'L1threshold': 'NOL1SEED', 'TLA': '', @@ -141,7 +145,7 @@ class JetChainConfiguration(ChainConfigurationBase): 'bMatching': [], 'bTag': '', 'bTracking': '', - 'chainPartName': 'j45', + 'chainPartName': chainPartName, 'cleaning': 'noCleaning', 'dataScouting': '', 'etaRange': '0eta320', @@ -149,11 +153,11 @@ class JetChainConfiguration(ChainConfigurationBase): 'hypoScenario': 'simple', 'jvt': '', 'momCuts': '', - 'multiplicity': '1', + 'multiplicity': multiplicity, 'scan': 'FS', 'signature': 'Jet', 'smc': 'nosmc', - 'threshold': '20', + 'threshold': threshold, 'topo': [], 'trigType': 'j'} ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 3010ba64162c359f3f60a639ada9126d27e6d715..77f34e21bcb6efa65b22d4b7b76d3f022b58bdf4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -246,9 +246,9 @@ def setupMenu(): ChainProp(name='HLT_j85_ftf_L1J20', groups=SingleJetGroup), ChainProp(name='HLT_j45_pf_ftf_L1J20', groups=SingleJetGroup), - ChainProp(name='HLT_j45_pf_ftf_preselj45_L1J20', groups=SingleJetGroup), - ChainProp(name='HLT_j45_ftf_preselj45_L1J20', groups=SingleJetGroup), - ChainProp(name='HLT_j45_subjesIS_ftf_preselj45_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_j85_pf_ftf_L1J20', groups=SingleJetGroup), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py index 22cb4f5be5a7d7df402402e4b0305a0aa93b5782..8567c63455710134a2b0a16912eaa6838863f6b0 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py @@ -133,7 +133,7 @@ JetChainParts = { 'bConfig' : ['split',], 'bMatching' : ['antimatchdr05mu'], 'trkopt' : ['notrk','ftk','ftkrefit','ftf'], - 'trkpresel' : ['nopresel','preselj45'], + 'trkpresel' : ['nopresel','preselj20'], 'hypoScenario' : ['simple', 'vbenf', 'vbenfSEP30etSEP34mass35SEP50fbet', 'dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass',