Merge pull request cms-sw#33857 from singh-ramanpreet/PUID_UL16

[PUID] Add UL16 and UL16APV training configs

Author: cmsbuild

RecoJets/JetProducers/python/PileupJetIDCutParams_cfi.py

@@ -72,7 +72,41 @@
 ###########################################################
 full_106x_UL18_chs_wp = full_106x_UL17_chs_wp.clone()
 
+###########################################################
+## Working points for the 106X UL16 training
+###########################################################
+full_106x_UL16_chs_wp = cms.PSet(
+    # 4 Eta Categories  0-2.5 2.5-2.75 2.75-3.0 3.0-5.0
+    # 5 Pt Categories   0-10, 10-20, 20-30, 30-40, 40-50
+
+    #Tight Id
+    Pt010_Tight  = cms.vdouble(-0.95, -0.70, -0.52, -0.49),
+    Pt1020_Tight = cms.vdouble(-0.95, -0.70, -0.52, -0.49),
+    Pt2030_Tight = cms.vdouble(-0.90, -0.57, -0.43, -0.42),
+    Pt3040_Tight = cms.vdouble(-0.71, -0.36, -0.29, -0.23),
+    Pt4050_Tight = cms.vdouble(-0.42, -0.09, -0.14, -0.02),
+
+    #Medium Id
+    Pt010_Medium  = cms.vdouble(0.20, -0.56, -0.43, -0.38),
+    Pt1020_Medium = cms.vdouble(0.20, -0.56, -0.43, -0.38),
+    Pt2030_Medium = cms.vdouble(0.62, -0.39, -0.32, -0.29),
+    Pt3040_Medium = cms.vdouble(0.86, -0.10, -0.15, -0.08),
+    Pt4050_Medium = cms.vdouble(0.93, 0.19, 0.04, 0.12),
+
+    #Loose Id
+    Pt010_Loose  = cms.vdouble(0.71, -0.32, -0.30, -0.22),
+    Pt1020_Loose = cms.vdouble(0.71, -0.32, -0.30, -0.22),
+    Pt2030_Loose = cms.vdouble(0.87, -0.08, -0.16, -0.12),
+    Pt3040_Loose = cms.vdouble(0.94, 0.24, 0.05, 0.10),
+    Pt4050_Loose = cms.vdouble(0.97, 0.48, 0.26, 0.29)
+)
+
 ##########################################################
+## Working points for the 106X UL16 APV training
+###########################################################
+full_106x_UL16APV_chs_wp = full_106x_UL16_chs_wp.clone()
+
+#########################################################
 ## Empty cutbased WP for compatibility
 ###########################################################
 EmptyCutBased_wp = cms.PSet()

RecoJets/JetProducers/python/PileupJetIDParams_cfi.py

@@ -156,6 +156,16 @@
 for train in full_106x_UL18_chs.trainings:
     train.tmvaWeights = train.tmvaWeights.value().replace("UL17", "UL18")
 
+####################################################################################################################
+full_106x_UL16_chs = full_106x_UL17_chs.clone(JetIdParams = full_106x_UL16_chs_wp)
+for train in full_106x_UL16_chs.trainings:
+    train.tmvaWeights = train.tmvaWeights.value().replace("UL17", "UL16")
+
+####################################################################################################################
+full_106x_UL16APV_chs = full_106x_UL17_chs.clone(JetIdParams = full_106x_UL16APV_chs_wp)
+for train in full_106x_UL16APV_chs.trainings:
+    train.tmvaWeights = train.tmvaWeights.value().replace("UL17", "UL16APV")
+
 ####################################################################################################################
 cutbased = cms.PSet(
     impactParTkThreshold = cms.double(1.),

RecoJets/JetProducers/python/PileupJetID_cfi.py

@@ -5,6 +5,7 @@
 from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016
 from Configuration.Eras.Modifier_run2_jme_2017_cff import run2_jme_2017
 from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
+from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016
 
 from RecoJets.JetProducers.PileupJetIDParams_cfi import *
 
@@ -13,6 +14,8 @@
 _chsalgos_102x = cms.VPSet(full_102x_chs,cutbased)
 _chsalgos_106X_UL17 = cms.VPSet(full_106x_UL17_chs,cutbased)
 _chsalgos_106X_UL18 = cms.VPSet(full_106x_UL18_chs,cutbased)
+_chsalgos_106X_UL16 = cms.VPSet(full_106x_UL16_chs,cutbased)
+_chsalgos_106X_UL16APV = cms.VPSet(full_106x_UL16APV_chs,cutbased)
 
 _stdalgos    = _chsalgos_106X_UL18
 
@@ -37,6 +40,8 @@
 run2_miniAOD_80XLegacy.toModify(pileupJetId, algos = _chsalgos_81x)
 run2_miniAOD_94XFall17.toModify(pileupJetId, algos = _chsalgos_94x)
 (run2_miniAOD_UL & run2_jme_2017).toModify(pileupJetId, algos = _chsalgos_106X_UL17)
+(run2_miniAOD_UL & run2_jme_2016 & ~tracker_apv_vfp30_2016).toModify(pileupJetId, algos = _chsalgos_106X_UL16)
+(run2_miniAOD_UL & run2_jme_2016 & tracker_apv_vfp30_2016).toModify(pileupJetId, algos = _chsalgos_106X_UL16APV)
 
 # Calculate variables, but don't run MVAs
 pileupJetIdCalculator = pileupJetId.clone(