Merge pull request cms-sw#106 from gkrintir/topic_ele80X

Topic ele80 x
rkunnawa · Feb 26, 2017 · 4518bcd · 4518bcd
2 parents 8e55358 + 261ae76
commit 4518bcd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pPb_DATA_80X.py b/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pPb_DATA_80X.py
@@ -156,8 +156,8 @@
 dataFormat = DataFormat.AOD
 switchOnVIDElectronIdProducer(process, dataFormat)
 
-# define which IDs we want to produce. Check here https://twiki.cern.ch/twiki/bin/viewauth/CMS/CutBasedElectronIdentificationRun2#Recipe_for_regular_users_for_7_4
-my_id_modules = ['RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Spring15_25ns_V1_cff']
+# define which IDs we want to produce. Check here https://twiki.cern.ch/twiki/bin/viewauth/CMS/CutBasedElectronIdentificationRun2#Working_points_for_2016_data_for
+my_id_modules = ['RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Summer16_80X_V1_cff']
 
 #add them to the VID producer
 for idmod in my_id_modules:

diff --git a/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pPb_MC_80X.py b/HeavyIonsAnalysis/JetAnalysis/test/runForestAOD_pPb_MC_80X.py
@@ -164,8 +164,8 @@
 dataFormat = DataFormat.AOD
 switchOnVIDElectronIdProducer(process, dataFormat)
 
-# define which IDs we want to produce. Check here https://twiki.cern.ch/twiki/bin/viewauth/CMS/CutBasedElectronIdentificationRun2#Recipe_for_regular_users_for_7_4
-my_id_modules = ['RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Spring15_25ns_V1_cff']
+# define which IDs we want to produce. Check here https://twiki.cern.ch/twiki/bin/viewauth/CMS/CutBasedElectronIdentificationRun2#Working_points_for_2016_data_for
+my_id_modules = ['RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Summer16_80X_V1_cff']
 
 #add them to the VID producer
 for idmod in my_id_modules:

diff --git a/HeavyIonsAnalysis/PhotonAnalysis/python/ElectronVID_cff.py b/HeavyIonsAnalysis/PhotonAnalysis/python/ElectronVID_cff.py
@@ -12,8 +12,14 @@
 electronMediumID25nsV1 = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Spring15-25ns-V1-standalone-medium")
 electronTightID25nsV1  = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Spring15-25ns-V1-standalone-tight")
 
+electronVetoID25nsV2   = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Summer16-80X-V1-veto")
+electronLooseID25nsV2  = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Summer16-80X-V1-loose")
+electronMediumID25nsV2 = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Summer16-80X-V1-medium")
+electronTightID25nsV2 = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Summer16-80X-V1-tight")
 
 # Effective areas for computing PU correction for isolations
 effAreasConfigFile50ns = cms.FileInPath("RecoEgamma/ElectronIdentification/data/Spring15/effAreaElectrons_cone03_pfNeuHadronsAndPhotons_50ns.txt")
 
 effAreasConfigFile25ns = cms.FileInPath("RecoEgamma/ElectronIdentification/data/Spring15/effAreaElectrons_cone03_pfNeuHadronsAndPhotons_25ns.txt")
+
+effAreasConfigFile25nsV2 = cms.FileInPath("RecoEgamma/ElectronIdentification/data/Summer16/effAreaElectrons_cone03_pfNeuHadronsAndPhotons_80X.txt")
diff --git a/HeavyIonsAnalysis/PhotonAnalysis/python/ggHiNtuplizer_cfi.py b/HeavyIonsAnalysis/PhotonAnalysis/python/ggHiNtuplizer_cfi.py
@@ -12,17 +12,17 @@
     genParticleSrc     = cms.InputTag("genParticles"),
     gsfElectronLabel   = cms.InputTag("gedGsfElectronsTmp"),
     recoPhotonSrc      = cms.InputTag("photons"),
-    electronVetoID     = electronVetoID25nsV1,
-    electronLooseID    = electronLooseID25nsV1,
-    electronMediumID   = electronMediumID25nsV1,
-    electronTightID    = electronTightID25nsV1,
+    electronVetoID     = electronVetoID25nsV2,
+    electronLooseID    = electronLooseID25nsV2,
+    electronMediumID   = electronMediumID25nsV2,
+    electronTightID    = electronTightID25nsV2,
     recoPhotonHiIsolationMap = cms.InputTag("photonIsolationHIProducer"),
     recoMuonSrc        = cms.InputTag("muons"),
     VtxLabel           = cms.InputTag("offlinePrimaryVertices"),
     rho                = cms.InputTag("fixedGridRhoFastjetAll"),
     beamSpot           = cms.InputTag('offlineBeamSpot'),
     conversions        = cms.InputTag('allConversions'),
-    effAreasConfigFile = effAreasConfigFile25ns,
+    effAreasConfigFile = effAreasConfigFile25nsV2,
     doPfIso            = cms.bool(True),
     doVsIso            = cms.bool(True),
     particleFlowCollection = cms.InputTag("particleFlowTmp"),