From 381fd2527dcec1252321ebf9db769b9a58d834a6 Mon Sep 17 00:00:00 2001 From: Alejandro Date: Wed, 26 Feb 2020 11:20:32 +0100 Subject: [PATCH 1/3] backport PUJet for 2017/2018 --- .../python/PileupJetIDCutParams_cfi.py | 55 ++-- .../python/PileupJetIDParams_cfi.py | 254 +++++++----------- .../JetProducers/python/PileupJetID_cfi.py | 9 +- 3 files changed, 131 insertions(+), 187 deletions(-) diff --git a/RecoJets/JetProducers/python/PileupJetIDCutParams_cfi.py b/RecoJets/JetProducers/python/PileupJetIDCutParams_cfi.py index c6178874f3f73..53ffe132e4e8c 100644 --- a/RecoJets/JetProducers/python/PileupJetIDCutParams_cfi.py +++ b/RecoJets/JetProducers/python/PileupJetIDCutParams_cfi.py @@ -6,7 +6,7 @@ full_81x_chs_wp = cms.PSet( #4 Eta Categories 0-2.5 2.5-2.75 2.75-3.0 3.0-5.0 - #Tight Id + #Tight Id Pt010_Tight = cms.vdouble( 0.69, -0.35, -0.26, -0.21), Pt1020_Tight = cms.vdouble( 0.69, -0.35, -0.26, -0.21), Pt2030_Tight = cms.vdouble( 0.69, -0.35, -0.26, -0.21), @@ -25,13 +25,24 @@ Pt3050_Loose = cms.vdouble(-0.89, -0.52, -0.38, -0.30) ) +########################################################### +## Working points for the 102X training +########################################################### +full_102x_chs_wp = full_81x_chs_wp.clone() + +########################################################### +## Working points for the 94X training +########################################################### +full_94x_chs_wp = full_81x_chs_wp.clone() + + ########################################################### ## Working points for the 80X training ########################################################### full_80x_chs_wp = cms.PSet( #4 Eta Categories 0-2.5 2.5-2.75 2.75-3.0 3.0-5.0 - #Tight Id + #Tight Id Pt010_Tight = cms.vdouble( 0.26, -0.34, -0.24, -0.26), Pt1020_Tight = cms.vdouble( 0.26, -0.34, -0.24, -0.26), Pt2030_Tight = cms.vdouble( 0.26, -0.34, -0.24, -0.26), @@ -55,8 +66,8 @@ ########################################################### full_76x_chs_wp = cms.PSet( #4 Eta Categories 0-2.5 2.5-2.75 2.75-3.0 3.0-5.0 - - #Tight Id + + #Tight Id Pt010_Tight = cms.vdouble(0.09,-0.37,-0.24,-0.21), Pt1020_Tight = cms.vdouble(0.09,-0.37,-0.24,-0.21), Pt2030_Tight = cms.vdouble(0.09,-0.37,-0.24,-0.21), @@ -72,7 +83,7 @@ Pt010_Loose = cms.vdouble(-0.96,-0.62,-0.53,-0.49), Pt1020_Loose = cms.vdouble(-0.96,-0.62,-0.53,-0.49), Pt2030_Loose = cms.vdouble(-0.96,-0.62,-0.53,-0.49), - Pt3050_Loose = cms.vdouble(-0.93,-0.52,-0.39,-0.31) + Pt3050_Loose = cms.vdouble(-0.93,-0.52,-0.39,-0.31) ) ########################################################### @@ -80,24 +91,24 @@ ########################################################### full_74x_chs_wp = cms.PSet( #4 Eta Categories 0-2.5 2.5-2.75 2.75-3.0 3.0-5.0 - - #Tight Id + + #Tight Id Pt010_Tight = cms.vdouble(-0.1,-0.83,-0.83,-0.98), Pt1020_Tight = cms.vdouble(-0.1,-0.83,-0.83,-0.98), Pt2030_Tight = cms.vdouble(-0.1,-0.83,-0.83,-0.98), Pt3050_Tight = cms.vdouble(-0.5,-0.77,-0.80,-0.98), - #Medium Id + #Medium Id Pt010_Medium = cms.vdouble(-0.3,-0.87,-0.87,-0.99), Pt1020_Medium = cms.vdouble(-0.3,-0.87,-0.87,-0.99), Pt2030_Medium = cms.vdouble(-0.3,-0.87,-0.87,-0.99), Pt3050_Medium = cms.vdouble(-0.6,-0.85,-0.85,-0.99), - #Loose Id + #Loose Id Pt010_Loose = cms.vdouble(-0.8,-0.97,-0.97,-0.99), Pt1020_Loose = cms.vdouble(-0.8,-0.97,-0.97,-0.99), Pt2030_Loose = cms.vdouble(-0.8,-0.97,-0.97,-0.99), - Pt3050_Loose = cms.vdouble(-0.8,-0.95,-0.97,-0.99) + Pt3050_Loose = cms.vdouble(-0.8,-0.95,-0.97,-0.99) ) ########################################################### @@ -111,19 +122,19 @@ Pt1020_Tight = cms.vdouble(-0.83,-0.81,-0.74,-0.81), Pt2030_Tight = cms.vdouble( 0.73, 0.05,-0.26,-0.42), Pt3050_Tight = cms.vdouble( 0.73, 0.05,-0.26,-0.42), - + #Medium Id Pt010_Medium = cms.vdouble(-0.83,-0.92,-0.90,-0.92), Pt1020_Medium = cms.vdouble(-0.83,-0.92,-0.90,-0.92), Pt2030_Medium = cms.vdouble( 0.10,-0.36,-0.54,-0.54), Pt3050_Medium = cms.vdouble( 0.10,-0.36,-0.54,-0.54), - + #Loose Id Pt010_Loose = cms.vdouble(-0.95,-0.96,-0.94,-0.95), Pt1020_Loose = cms.vdouble(-0.95,-0.96,-0.94,-0.95), Pt2030_Loose = cms.vdouble(-0.63,-0.60,-0.55,-0.45), Pt3050_Loose = cms.vdouble(-0.63,-0.60,-0.55,-0.45), - + #MET Pt010_MET = cms.vdouble( 0. ,-0.6,-0.4,-0.4), Pt1020_MET = cms.vdouble( 0.3 ,-0.2,-0.4,-0.4), @@ -139,13 +150,13 @@ Pt1020_Tight = cms.vdouble(-0.83,-0.81,-0.74,-0.81), Pt2030_Tight = cms.vdouble( 0.78, 0.50, 0.17, 0.17), Pt3050_Tight = cms.vdouble( 0.78, 0.50, 0.17, 0.17), - + #Medium Id Pt010_Medium = cms.vdouble(-0.83,-0.92,-0.90,-0.92), Pt1020_Medium = cms.vdouble(-0.83,-0.92,-0.90,-0.92), Pt2030_Medium = cms.vdouble(-0.07,-0.09, 0.00,-0.06), Pt3050_Medium = cms.vdouble(-0.07,-0.09, 0.00,-0.06), - + #Loose Id Pt010_Loose = cms.vdouble(-0.95,-0.96,-0.94,-0.95), Pt1020_Loose = cms.vdouble(-0.95,-0.96,-0.94,-0.95), @@ -154,7 +165,7 @@ ) met_53x_wp = cms.PSet( - + #Tight Id Pt010_Tight = cms.vdouble(-2, -2, -2, -2, -2), Pt1020_Tight = cms.vdouble(-2, -2, -2, -2, -2), @@ -217,7 +228,7 @@ simple_5x_wp = cms.PSet( #4 Eta Categories 0-2.5 2.5-2.75 2.75-3.0 3.0-5.0 - + #Tight Id Pt010_Tight = cms.vdouble(-0.54,-0.93,-0.93,-0.94), Pt1020_Tight = cms.vdouble(-0.54,-0.93,-0.93,-0.94), @@ -235,7 +246,7 @@ Pt1020_Loose = cms.vdouble(-0.95,-0.97,-0.96,-0.97), Pt2030_Loose = cms.vdouble(-0.80,-0.86,-0.80,-0.84), Pt3050_Loose = cms.vdouble(-0.80,-0.86,-0.80,-0.84) - + ) ########################################################### @@ -364,13 +375,13 @@ Pt1020_BetaStarTight = cms.vdouble( 0.15, 0.15, 999., 999.), Pt2030_BetaStarTight = cms.vdouble( 0.15, 0.15, 999., 999.), Pt3050_BetaStarTight = cms.vdouble( 0.15, 0.15, 999., 999.), - + #Medium Id => Daniele Pt010_BetaStarMedium = cms.vdouble( 0.2, 0.3, 999., 999.), Pt1020_BetaStarMedium = cms.vdouble( 0.2, 0.3, 999., 999.), Pt2030_BetaStarMedium = cms.vdouble( 0.2, 0.3, 999., 999.), Pt3050_BetaStarMedium = cms.vdouble( 0.2, 0.3, 999., 999.), - + #Loose Id Pt010_BetaStarLoose = cms.vdouble( 0.2, 0.3, 999., 999.), Pt1020_BetaStarLoose = cms.vdouble( 0.2, 0.3, 999., 999.), @@ -383,13 +394,13 @@ Pt1020_RMSTight = cms.vdouble( 0.06, 0.07, 0.04, 0.05), Pt2030_RMSTight = cms.vdouble( 0.05, 0.07, 0.03, 0.045), Pt3050_RMSTight = cms.vdouble( 0.05, 0.06, 0.03, 0.04), - + #Medium Id => Daniele Pt010_RMSMedium = cms.vdouble( 0.06, 0.03, 0.03, 0.04), Pt1020_RMSMedium = cms.vdouble( 0.06, 0.03, 0.03, 0.04), Pt2030_RMSMedium = cms.vdouble( 0.06, 0.03, 0.03, 0.04), Pt3050_RMSMedium = cms.vdouble( 0.06, 0.03, 0.03, 0.04), - + #Loose Id Pt010_RMSLoose = cms.vdouble( 0.06, 0.05, 0.05, 0.07), Pt1020_RMSLoose = cms.vdouble( 0.06, 0.05, 0.05, 0.07), diff --git a/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py b/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py index cca5b2b2a8223..36caccc87e70b 100644 --- a/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py +++ b/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py @@ -104,6 +104,52 @@ label = cms.string("full") ) +#################################################################################################################### +trainingVariables_102X_Eta0To3 = [ + "nvtx" , + "beta" , + "dR2Mean" , + "frac01" , + "frac02" , + "frac03" , + "frac04" , + "majW" , + "minW" , + "jetR" , + "jetRchg" , + "nParticles", + "nCharged" , + "ptD" , + "pull" , + ] +trainingVariables_102X_Eta3To5 = list(trainingVariables_102X_Eta0To3) +trainingVariables_102X_Eta3To5.remove('beta') +trainingVariables_102X_Eta3To5.remove('jetRchg') +trainingVariables_102X_Eta3To5.remove('nCharged') + +full_102x_chs = full_81x_chs.clone(JetIdParams = full_102x_chs_wp) +full_102x_chs.trainings[0].tmvaWeights = "RecoJets/JetProducers/data/pileupJetId_102X_Eta0p0To2p5_chs_BDT.weights.xml.gz" +full_102x_chs.trainings[0].tmvaVariables = trainingVariables_102X_Eta0To3 +full_102x_chs.trainings[1].tmvaWeights = "RecoJets/JetProducers/data/pileupJetId_102X_Eta2p5To2p75_chs_BDT.weights.xml.gz" +full_102x_chs.trainings[1].tmvaVariables = trainingVariables_102X_Eta0To3 +full_102x_chs.trainings[2].tmvaWeights = "RecoJets/JetProducers/data/pileupJetId_102X_Eta2p75To3p0_chs_BDT.weights.xml.gz" +full_102x_chs.trainings[2].tmvaVariables = trainingVariables_102X_Eta0To3 +full_102x_chs.trainings[3].tmvaWeights = "RecoJets/JetProducers/data/pileupJetId_102X_Eta3p0To5p0_chs_BDT.weights.xml.gz" +full_102x_chs.trainings[3].tmvaVariables = trainingVariables_102X_Eta3To5 + +#################################################################################################################### +trainingVariables_94X_Eta0To3 = list(trainingVariables_102X_Eta0To3) +trainingVariables_94X_Eta3To5 = list(trainingVariables_102X_Eta3To5) +full_94x_chs = full_81x_chs.clone(JetIdParams = full_94x_chs_wp) +full_94x_chs.trainings[0].tmvaWeights = "RecoJets/JetProducers/data/pileupJetId_94X_Eta0p0To2p5_chs_BDT.weights.xml.gz" +full_94x_chs.trainings[0].tmvaVariables = trainingVariables_94X_Eta0To3 +full_94x_chs.trainings[1].tmvaWeights = "RecoJets/JetProducers/data/pileupJetId_94X_Eta2p5To2p75_chs_BDT.weights.xml.gz" +full_94x_chs.trainings[1].tmvaVariables = trainingVariables_94X_Eta0To3 +full_94x_chs.trainings[2].tmvaWeights = "RecoJets/JetProducers/data/pileupJetId_94X_Eta2p75To3p0_chs_BDT.weights.xml.gz" +full_94x_chs.trainings[2].tmvaVariables = trainingVariables_94X_Eta0To3 +full_94x_chs.trainings[3].tmvaWeights = "RecoJets/JetProducers/data/pileupJetId_94X_Eta3p0To5p0_chs_BDT.weights.xml.gz" +full_94x_chs.trainings[3].tmvaVariables = trainingVariables_94X_Eta3To5 + #################################################################################################################### full_80x_chs = cms.PSet( @@ -208,7 +254,7 @@ label = cms.string("full") ) -#################################################################################################################### +#################################################################################################################### full_76x_chs = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -310,7 +356,7 @@ JetIdParams = full_76x_chs_wp, label = cms.string("full") ) -#################################################################################################################### +#################################################################################################################### full_74x_chs = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -416,7 +462,7 @@ JetIdParams = full_74x_chs_wp, label = cms.string("full") ) -#################################################################################################################### +#################################################################################################################### full_53x = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -426,18 +472,18 @@ version = cms.int32(-1), tmvaVariables = cms.vstring( "nvtx" , - "dZ" , - "beta" , - "betaStar" , - "nCharged" , - "nNeutrals", - "dR2Mean" , - "ptD" , - "frac01" , - "frac02" , - "frac03" , - "frac04" , - "frac05" , + "dZ" , + "beta" , + "betaStar" , + "nCharged" , + "nNeutrals", + "dR2Mean" , + "ptD" , + "frac01" , + "frac02" , + "frac03" , + "frac04" , + "frac05" , ), tmvaSpectators = cms.vstring( "jetPt", @@ -447,7 +493,7 @@ JetIdParams = full_53x_wp, label = cms.string("full53x") ) -#################################################################################################################### +#################################################################################################################### full_53x_chs = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -458,18 +504,18 @@ version = cms.int32(-1), tmvaVariables = cms.vstring( "nvtx" , - "dZ" , - "beta" , - "betaStar" , - "nCharged" , - "nNeutrals", - "dR2Mean" , - "ptD" , - "frac01" , - "frac02" , - "frac03" , - "frac04" , - "frac05" , + "dZ" , + "beta" , + "betaStar" , + "nCharged" , + "nNeutrals", + "dR2Mean" , + "ptD" , + "frac01" , + "frac02" , + "frac03" , + "frac04" , + "frac05" , ), tmvaSpectators = cms.vstring( "jetPt", @@ -479,7 +525,7 @@ JetIdParams = full_53x_chs_wp, label = cms.string("full") ) -#################################################################################################################### +#################################################################################################################### met_53x = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -492,24 +538,24 @@ "jetPt" , "jetEta" , "jetPhi" , - "dZ" , - "beta" , - "betaStar" , - "nCharged" , - "nNeutrals", - "dR2Mean" , - "ptD" , - "frac01" , - "frac02" , - "frac03" , - "frac04" , - "frac05" , + "dZ" , + "beta" , + "betaStar" , + "nCharged" , + "nNeutrals", + "dR2Mean" , + "ptD" , + "frac01" , + "frac02" , + "frac03" , + "frac04" , + "frac05" , ), tmvaSpectators = cms.vstring(), JetIdParams = met_53x_wp, label = cms.string("met53x") ) -#################################################################################################################### +################################################################################################################## full_5x = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -539,32 +585,7 @@ label = cms.string("full") ) -#################################################################################################################### -simple_5x = cms.PSet( - impactParTkThreshold = cms.double(1.) , - cutBased = cms.bool(False), - tmvaWeights = cms.string("RecoJets/JetProducers/data/TMVAClassification_5x_BDT_simpleNoVtxCat.weights.xml.gz"), - tmvaMethod = cms.string("BDT_simpleNoVtxCat"), - version = cms.int32(-1), - tmvaVariables = cms.vstring( - "frac01", - "frac02", - "frac03", - "frac04", - "frac05", - "nvtx", - "beta", - "betaStar", - ), - tmvaSpectators = cms.vstring( - "jetPt", - "jetEta", - ), - JetIdParams = simple_5x_wp, - label = cms.string("simple") - ) - -#################################################################################################################### +################################################################################################################## full_5x_chs = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -594,106 +615,15 @@ label = cms.string("full") ) -#################################################################################################################### -simple_5x_chs = cms.PSet( - impactParTkThreshold = cms.double(1.) , - cutBased = cms.bool(False), - etaBinnedWeights = cms.bool(False), - tmvaWeights = cms.string("RecoJets/JetProducers/data/TMVAClassification_5x_BDT_chsSimpleNoVtxCat.weights.xml.gz"), - tmvaMethod = cms.string("BDT_chsSimpleNoVtxCat"), - version = cms.int32(-1), - tmvaVariables = cms.vstring( - "frac01", - "frac02", - "frac03", - "frac04", - "frac05", - "nvtx", - "beta", - "betaStar", - ), - tmvaSpectators = cms.vstring( - "jetPt", - "jetEta", - ), - JetIdParams = simple_5x_chs_wp, - label = cms.string("simple") - ) - -#################################################################################################################### -full = cms.PSet( - impactParTkThreshold = cms.double(1.) , - cutBased = cms.bool(False), - etaBinnedWeights = cms.bool(False), - tmvaWeights = cms.string("RecoJets/JetProducers/data/TMVAClassification_PuJetIdOptMVA.weights.xml.gz"), - tmvaMethod = cms.string("PuJetIdOptMVA"), - version = cms.int32(-1), - tmvaVariables = cms.vstring( - "frac01", - "frac02", - "frac03", - "frac04", - "frac05", - "nvtx", - "nNeutrals", - "beta", - "betaStar", - "dZ", - "nCharged", - ), - tmvaSpectators = cms.vstring( - "jetPt", - "jetEta", - ), - JetIdParams = PuJetIdOptMVA_wp, - label = cms.string("full") - ) - -#################################################################################################################### -simple = cms.PSet( - impactParTkThreshold = cms.double(1.) , - cutBased = cms.bool(False), - etaBinnedWeights = cms.bool(False), - tmvaWeights = cms.string("RecoJets/JetProducers/data/TMVAClassification_PuJetIdMinMVA.weights.xml.gz"), - tmvaMethod = cms.string("PuJetIdMinMVA"), - version = cms.int32(-1), - tmvaVariables = cms.vstring( - "frac01", - "frac02", - "frac03", - "frac04", - "frac05", - "beta", - "betaStar", - ), - tmvaSpectators = cms.vstring( - "nvtx", - "jetPt", - "jetEta", - ), - JetIdParams = PuJetIdMinMVA_wp, - label = cms.string("simple") - ) - -#################################################################################################################### -cutbased = cms.PSet( +#################################################################################################################### +cutbased = cms.PSet( impactParTkThreshold = cms.double(1.), cutBased = cms.bool(True), JetIdParams = PuJetIdCutBased_wp, label = cms.string("cutbased") ) -#################################################################################################################### -PhilV0 = cms.PSet( - impactParTkThreshold = cms.double(1.) , - cutBased = cms.bool(False), - tmvaWeights = cms.string("RecoJets/JetProducers/data/mva_JetID.weights.xml.gz"), - tmvaMethod = cms.string("JetID"), - version = cms.int32(0), - JetIdParams = EmptyJetIdParams -) - -#################################################################################################################### +#################################################################################################################### PhilV1 = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), diff --git a/RecoJets/JetProducers/python/PileupJetID_cfi.py b/RecoJets/JetProducers/python/PileupJetID_cfi.py index 8b257c4049b7a..e818905b40c96 100644 --- a/RecoJets/JetProducers/python/PileupJetID_cfi.py +++ b/RecoJets/JetProducers/python/PileupJetID_cfi.py @@ -1,18 +1,20 @@ import FWCore.ParameterSet.Config as cms -from RecoJets.JetProducers.PileupJetIDParams_cfi import * +from RecoJets.JetProducers.PileupJetIDParams_cfi import * #_stdalgos_4x = cms.VPSet(full, cutbased,PhilV1) _stdalgos_5x = cms.VPSet(full_5x,cutbased,PhilV1) -#_chsalgos_4x = cms.VPSet(full, cutbased) +#_chsalgos_4x = cms.VPSet(full, cutbased) _chsalgos_5x = cms.VPSet(full_5x_chs,cutbased) _chsalgos_74x = cms.VPSet(full_74x_chs,cutbased) _chsalgos_76x = cms.VPSet(full_76x_chs,cutbased) _chsalgos_80x = cms.VPSet(full_80x_chs,cutbased) _chsalgos_81x = cms.VPSet(full_81x_chs,cutbased) +_chsalgos_94x = cms.VPSet(full_94x_chs,cutbased) +_chsalgos_102x = cms.VPSet(full_102x_chs,cutbased) -_stdalgos = _chsalgos_81x +_stdalgos = _chsalgos_102x # Calculate+store variables and run MVAs pileupJetId = cms.EDProducer('PileupJetIdProducer', @@ -27,6 +29,7 @@ applyJec = cms.bool(True), inputIsCorrected = cms.bool(False), residualsFromTxt = cms.bool(False), + usePuppi = cms.bool(False), # residualsTxt = cms.FileInPath("RecoJets/JetProducers/data/download.url") # must be an existing file ) From 9549493aaf7033ba9d4166665a515ab9809fd6e1 Mon Sep 17 00:00:00 2001 From: Alejandro Date: Fri, 28 Feb 2020 10:22:34 +0100 Subject: [PATCH 2/3] fixing RECO review --- .../python/PileupJetIDParams_cfi.py | 211 ++++++++++++++---- .../JetProducers/python/PileupJetID_cfi.py | 3 +- 2 files changed, 165 insertions(+), 49 deletions(-) diff --git a/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py b/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py index 36caccc87e70b..74ae468f07299 100644 --- a/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py +++ b/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py @@ -103,7 +103,6 @@ JetIdParams = full_81x_chs_wp, label = cms.string("full") ) - #################################################################################################################### trainingVariables_102X_Eta0To3 = [ "nvtx" , @@ -151,6 +150,8 @@ full_94x_chs.trainings[3].tmvaVariables = trainingVariables_94X_Eta3To5 + + #################################################################################################################### full_80x_chs = cms.PSet( impactParTkThreshold = cms.double(1.), @@ -254,7 +255,7 @@ label = cms.string("full") ) -#################################################################################################################### +#################################################################################################################### full_76x_chs = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -356,7 +357,7 @@ JetIdParams = full_76x_chs_wp, label = cms.string("full") ) -#################################################################################################################### +#################################################################################################################### full_74x_chs = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -462,7 +463,7 @@ JetIdParams = full_74x_chs_wp, label = cms.string("full") ) -#################################################################################################################### +#################################################################################################################### full_53x = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -472,18 +473,18 @@ version = cms.int32(-1), tmvaVariables = cms.vstring( "nvtx" , - "dZ" , - "beta" , - "betaStar" , - "nCharged" , - "nNeutrals", - "dR2Mean" , - "ptD" , - "frac01" , - "frac02" , - "frac03" , - "frac04" , - "frac05" , + "dZ" , + "beta" , + "betaStar" , + "nCharged" , + "nNeutrals", + "dR2Mean" , + "ptD" , + "frac01" , + "frac02" , + "frac03" , + "frac04" , + "frac05" , ), tmvaSpectators = cms.vstring( "jetPt", @@ -493,7 +494,7 @@ JetIdParams = full_53x_wp, label = cms.string("full53x") ) -#################################################################################################################### +#################################################################################################################### full_53x_chs = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -504,18 +505,18 @@ version = cms.int32(-1), tmvaVariables = cms.vstring( "nvtx" , - "dZ" , - "beta" , - "betaStar" , - "nCharged" , - "nNeutrals", - "dR2Mean" , - "ptD" , - "frac01" , - "frac02" , - "frac03" , - "frac04" , - "frac05" , + "dZ" , + "beta" , + "betaStar" , + "nCharged" , + "nNeutrals", + "dR2Mean" , + "ptD" , + "frac01" , + "frac02" , + "frac03" , + "frac04" , + "frac05" , ), tmvaSpectators = cms.vstring( "jetPt", @@ -525,7 +526,7 @@ JetIdParams = full_53x_chs_wp, label = cms.string("full") ) -#################################################################################################################### +#################################################################################################################### met_53x = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -538,24 +539,24 @@ "jetPt" , "jetEta" , "jetPhi" , - "dZ" , - "beta" , - "betaStar" , - "nCharged" , - "nNeutrals", - "dR2Mean" , - "ptD" , - "frac01" , - "frac02" , - "frac03" , - "frac04" , - "frac05" , + "dZ" , + "beta" , + "betaStar" , + "nCharged" , + "nNeutrals", + "dR2Mean" , + "ptD" , + "frac01" , + "frac02" , + "frac03" , + "frac04" , + "frac05" , ), tmvaSpectators = cms.vstring(), JetIdParams = met_53x_wp, label = cms.string("met53x") ) -################################################################################################################## +#################################################################################################################### full_5x = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -585,7 +586,32 @@ label = cms.string("full") ) -################################################################################################################## +#################################################################################################################### +simple_5x = cms.PSet( + impactParTkThreshold = cms.double(1.) , + cutBased = cms.bool(False), + tmvaWeights = cms.string("RecoJets/JetProducers/data/TMVAClassification_5x_BDT_simpleNoVtxCat.weights.xml.gz"), + tmvaMethod = cms.string("BDT_simpleNoVtxCat"), + version = cms.int32(-1), + tmvaVariables = cms.vstring( + "frac01", + "frac02", + "frac03", + "frac04", + "frac05", + "nvtx", + "beta", + "betaStar", + ), + tmvaSpectators = cms.vstring( + "jetPt", + "jetEta", + ), + JetIdParams = simple_5x_wp, + label = cms.string("simple") + ) + +#################################################################################################################### full_5x_chs = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), @@ -615,15 +641,106 @@ label = cms.string("full") ) -#################################################################################################################### -cutbased = cms.PSet( +#################################################################################################################### +simple_5x_chs = cms.PSet( + impactParTkThreshold = cms.double(1.) , + cutBased = cms.bool(False), + etaBinnedWeights = cms.bool(False), + tmvaWeights = cms.string("RecoJets/JetProducers/data/TMVAClassification_5x_BDT_chsSimpleNoVtxCat.weights.xml.gz"), + tmvaMethod = cms.string("BDT_chsSimpleNoVtxCat"), + version = cms.int32(-1), + tmvaVariables = cms.vstring( + "frac01", + "frac02", + "frac03", + "frac04", + "frac05", + "nvtx", + "beta", + "betaStar", + ), + tmvaSpectators = cms.vstring( + "jetPt", + "jetEta", + ), + JetIdParams = simple_5x_chs_wp, + label = cms.string("simple") + ) + +#################################################################################################################### +full = cms.PSet( + impactParTkThreshold = cms.double(1.) , + cutBased = cms.bool(False), + etaBinnedWeights = cms.bool(False), + tmvaWeights = cms.string("RecoJets/JetProducers/data/TMVAClassification_PuJetIdOptMVA.weights.xml.gz"), + tmvaMethod = cms.string("PuJetIdOptMVA"), + version = cms.int32(-1), + tmvaVariables = cms.vstring( + "frac01", + "frac02", + "frac03", + "frac04", + "frac05", + "nvtx", + "nNeutrals", + "beta", + "betaStar", + "dZ", + "nCharged", + ), + tmvaSpectators = cms.vstring( + "jetPt", + "jetEta", + ), + JetIdParams = PuJetIdOptMVA_wp, + label = cms.string("full") + ) + +#################################################################################################################### +simple = cms.PSet( + impactParTkThreshold = cms.double(1.) , + cutBased = cms.bool(False), + etaBinnedWeights = cms.bool(False), + tmvaWeights = cms.string("RecoJets/JetProducers/data/TMVAClassification_PuJetIdMinMVA.weights.xml.gz"), + tmvaMethod = cms.string("PuJetIdMinMVA"), + version = cms.int32(-1), + tmvaVariables = cms.vstring( + "frac01", + "frac02", + "frac03", + "frac04", + "frac05", + "beta", + "betaStar", + ), + tmvaSpectators = cms.vstring( + "nvtx", + "jetPt", + "jetEta", + ), + JetIdParams = PuJetIdMinMVA_wp, + label = cms.string("simple") + ) + +#################################################################################################################### +cutbased = cms.PSet( impactParTkThreshold = cms.double(1.), cutBased = cms.bool(True), JetIdParams = PuJetIdCutBased_wp, label = cms.string("cutbased") ) -#################################################################################################################### +#################################################################################################################### +PhilV0 = cms.PSet( + impactParTkThreshold = cms.double(1.) , + cutBased = cms.bool(False), + tmvaWeights = cms.string("RecoJets/JetProducers/data/mva_JetID.weights.xml.gz"), + tmvaMethod = cms.string("JetID"), + version = cms.int32(0), + JetIdParams = EmptyJetIdParams +) + +#################################################################################################################### PhilV1 = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), diff --git a/RecoJets/JetProducers/python/PileupJetID_cfi.py b/RecoJets/JetProducers/python/PileupJetID_cfi.py index e818905b40c96..d8c22b3bf5692 100644 --- a/RecoJets/JetProducers/python/PileupJetID_cfi.py +++ b/RecoJets/JetProducers/python/PileupJetID_cfi.py @@ -14,7 +14,7 @@ _chsalgos_94x = cms.VPSet(full_94x_chs,cutbased) _chsalgos_102x = cms.VPSet(full_102x_chs,cutbased) -_stdalgos = _chsalgos_102x +_stdalgos = _chsalgos_81x # Calculate+store variables and run MVAs pileupJetId = cms.EDProducer('PileupJetIdProducer', @@ -29,7 +29,6 @@ applyJec = cms.bool(True), inputIsCorrected = cms.bool(False), residualsFromTxt = cms.bool(False), - usePuppi = cms.bool(False), # residualsTxt = cms.FileInPath("RecoJets/JetProducers/data/download.url") # must be an existing file ) From 5bb98a445a7a5040d07a34d4abcacd393208ec35 Mon Sep 17 00:00:00 2001 From: Alejandro Date: Fri, 28 Feb 2020 10:53:23 +0100 Subject: [PATCH 3/3] adding modifier --- RecoJets/JetProducers/python/PileupJetID_cfi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RecoJets/JetProducers/python/PileupJetID_cfi.py b/RecoJets/JetProducers/python/PileupJetID_cfi.py index d8c22b3bf5692..e91741605f53e 100644 --- a/RecoJets/JetProducers/python/PileupJetID_cfi.py +++ b/RecoJets/JetProducers/python/PileupJetID_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms - +from Configuration.Eras.Modifier_run2_miniAOD_devel_cff import run2_miniAOD_devel from RecoJets.JetProducers.PileupJetIDParams_cfi import * #_stdalgos_4x = cms.VPSet(full, cutbased,PhilV1) @@ -15,6 +15,7 @@ _chsalgos_102x = cms.VPSet(full_102x_chs,cutbased) _stdalgos = _chsalgos_81x +run2_miniAOD_devel.toReplaceWith(_stdalgos, _chsalgos_102x) # Calculate+store variables and run MVAs pileupJetId = cms.EDProducer('PileupJetIdProducer',