diff --git a/PhysicsTools/NanoAOD/python/nanoDQM_cfi.py b/PhysicsTools/NanoAOD/python/nanoDQM_cfi.py index 332428aef589c..08ba0a4ba0388 100644 --- a/PhysicsTools/NanoAOD/python/nanoDQM_cfi.py +++ b/PhysicsTools/NanoAOD/python/nanoDQM_cfi.py @@ -609,7 +609,6 @@ NoPlot('jetIdx'), NoPlot('mass'), Plot1D('mvaID', 'mvaID', 20, -1, 1, 'MVA ID score'), - Plot1D('mvaID_Fall17V1p1', 'mvaID_Fall17V1p1', 20, -1, 1, 'MVA ID score, Fall17V1p1'), Plot1D('mvaID_WP80', 'mvaID_WP80', 2, -0.5, 1.5, 'MVA ID WP80'), Plot1D('mvaID_WP90', 'mvaID_WP90', 2, -0.5, 1.5, 'MVA ID WP90'), Plot1D('pfPhoIso03', 'pfPhoIso03', 100, 0, 1, 'PF absolute isolation dR=0.3, photon component (uncorrected)'), diff --git a/PhysicsTools/NanoAOD/python/photons_cff.py b/PhysicsTools/NanoAOD/python/photons_cff.py index 74d2e6633a86c..dbdc8ab36c499 100644 --- a/PhysicsTools/NanoAOD/python/photons_cff.py +++ b/PhysicsTools/NanoAOD/python/photons_cff.py @@ -118,7 +118,6 @@ def make_bitmapVID_docstring(id_modules_working_points_pset): src = cms.InputTag("slimmedPhotons"), userFloats = cms.PSet( mvaID = cms.InputTag("photonMVAValueMapProducer:PhotonMVAEstimatorRunIIFall17v2Values"), - mvaID_Fall17V1p1 = cms.InputTag("photonMVAValueMapProducer:PhotonMVAEstimatorRunIIFall17v1p1Values"), PFIsoChg = cms.InputTag("isoForPho:PFIsoChg"), PFIsoAll = cms.InputTag("isoForPho:PFIsoAll"), ), @@ -203,7 +202,6 @@ def make_bitmapVID_docstring(id_modules_working_points_pset): electronVeto = Var("passElectronVeto()",bool,doc="pass electron veto"), pixelSeed = Var("hasPixelSeed()",bool,doc="has pixel seed"), mvaID = Var("userFloat('mvaID')",float,doc="MVA ID score, Fall17V2",precision=10), - mvaID_Fall17V1p1 = Var("userFloat('mvaID_Fall17V1p1')",float,doc="MVA ID score, Fall17V1p1",precision=10), mvaID_WP90 = Var("userInt('mvaID_WP90')",bool,doc="MVA ID WP90, Fall17V2"), mvaID_WP80 = Var("userInt('mvaID_WP80')",bool,doc="MVA ID WP80, Fall17V2"), pfPhoIso03 = Var("photonIso()",float,doc="PF absolute isolation dR=0.3, photon component (uncorrected)"), @@ -346,14 +344,12 @@ def make_bitmapVID_docstring(id_modules_working_points_pset): (run3_nanoAOD_devel).toModify(slimmedPhotonsWithUserData.userInts, VIDNestedWPBitmap = None,) (run3_nanoAOD_devel).toModify(slimmedPhotonsWithUserData.userFloats, - mvaID = None, - mvaID_Fall17V1p1 = None) + mvaID = None) (run3_nanoAOD_devel).toModify(photonTable.variables, cutBased = None, cutBased_Fall17V1Bitmap = None, vidNestedWPBitmap = None, mvaID = None, - mvaID_Fall17V1p1 = None, mvaID_WP90 = None, mvaID_WP80 = None, )