From 8f2fc22f0e126d40554eae8c38281b190cd26354 Mon Sep 17 00:00:00 2001 From: Sam Harper Date: Wed, 31 Jan 2018 14:51:07 +0000 Subject: [PATCH] renaming customiser from run2_miniAOD_9X to run2_miniAOD_94XFall17 --- ...=> Modifier_run2_miniAOD_94XFall17_cff.py} | 2 +- .../StandardSequences/python/Eras.py | 2 +- .../PatAlgos/python/slimming/miniAOD_tools.py | 28 +++++++++---------- .../python/reducedEgamma_cfi.py | 4 +-- 4 files changed, 18 insertions(+), 18 deletions(-) rename Configuration/Eras/python/{Modifier_run2_miniAOD_9X_cff.py => Modifier_run2_miniAOD_94XFall17_cff.py} (51%) diff --git a/Configuration/Eras/python/Modifier_run2_miniAOD_9X_cff.py b/Configuration/Eras/python/Modifier_run2_miniAOD_94XFall17_cff.py similarity index 51% rename from Configuration/Eras/python/Modifier_run2_miniAOD_9X_cff.py rename to Configuration/Eras/python/Modifier_run2_miniAOD_94XFall17_cff.py index 19195873b2209..36d35fbecdad6 100644 --- a/Configuration/Eras/python/Modifier_run2_miniAOD_9X_cff.py +++ b/Configuration/Eras/python/Modifier_run2_miniAOD_94XFall17_cff.py @@ -1,3 +1,3 @@ import FWCore.ParameterSet.Config as cms -run2_miniAOD_9X = cms.Modifier() +run2_miniAOD_94XFall17 = cms.Modifier() diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 275c3c9a4fa4c..737e112b43a89 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -43,7 +43,7 @@ def __init__(self): 'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_timing_layer','phase2_hcal', 'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'trackingPhase2PU140', - 'tracker_apv_vfp30_2016', 'run2_miniAOD_80XLegacy','run2_miniAOD_9X', 'run2_nanoAOD_92X', + 'tracker_apv_vfp30_2016', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X', 'hcalHardcodeConditions', 'hcalSkipPacker'] internalUseModChains = ['run2_2017_noTrackingModifier'] diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index f599b3a6683dd..d86e989fcd9f6 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -56,11 +56,11 @@ def miniAOD_customizeCommon(process): addPFClusterIso = cms.bool(True), ecalPFClusterIsoMap = cms.InputTag("reducedEgamma", "eleEcalPFClusIso"), hcalPFClusterIsoMap = cms.InputTag("reducedEgamma", "eleHcalPFClusIso")) - from Configuration.Eras.Modifier_run2_miniAOD_9X_cff import run2_miniAOD_9X - run2_miniAOD_9X.toModify(process.patElectrons, - addPFClusterIso = cms.bool(True), - ecalPFClusterIsoMap = cms.InputTag("reducedEgamma", "eleEcalPFClusIso"), - hcalPFClusterIsoMap = cms.InputTag("reducedEgamma", "eleHcalPFClusIso")) + from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17 + run2_miniAOD_94XFall17.toModify(process.patElectrons, + addPFClusterIso = cms.bool(True), + ecalPFClusterIsoMap = cms.InputTag("reducedEgamma", "eleEcalPFClusIso"), + hcalPFClusterIsoMap = cms.InputTag("reducedEgamma", "eleHcalPFClusIso")) #add puppi isolation in miniAOD process.patElectrons.addPuppiIsolation = cms.bool(True) process.patElectrons.puppiIsolationChargedHadrons = cms.InputTag("egmElectronPUPPIIsolation","h+-DR030-BarVeto000-EndVeto001") @@ -95,16 +95,16 @@ def miniAOD_customizeCommon(process): addPFClusterIso = cms.bool(True), ecalPFClusterIsoMap = cms.InputTag("reducedEgamma", "phoEcalPFClusIso"), hcalPFClusterIsoMap = cms.InputTag("reducedEgamma", "phoHcalPFClusIso")) - from Configuration.Eras.Modifier_run2_miniAOD_9X_cff import run2_miniAOD_9X - run2_miniAOD_9X.toModify(process.patPhotons, - addPFClusterIso = cms.bool(True), - ecalPFClusterIsoMap = cms.InputTag("reducedEgamma", "phoEcalPFClusIso"), - hcalPFClusterIsoMap = cms.InputTag("reducedEgamma", "phoHcalPFClusIso")) + from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17 + run2_miniAOD_94XFall17.toModify(process.patPhotons, + addPFClusterIso = cms.bool(True), + ecalPFClusterIsoMap = cms.InputTag("reducedEgamma", "phoEcalPFClusIso"), + hcalPFClusterIsoMap = cms.InputTag("reducedEgamma", "phoHcalPFClusIso")) #the 80X legacy customsations are done in ootPhotonProducer for OOT photons - run2_miniAOD_9X.toModify(process.patOOTPhotons, - addPFClusterIso = cms.bool(True), - ecalPFClusterIsoMap = cms.InputTag("reducedEgamma", "ootPhoEcalPFClusIso"), - hcalPFClusterIsoMap = cms.InputTag("reducedEgamma", "ootPhoHcalPFClusIso")) + run2_miniAOD_94XFall17.toModify(process.patOOTPhotons, + addPFClusterIso = cms.bool(True), + ecalPFClusterIsoMap = cms.InputTag("reducedEgamma", "ootPhoEcalPFClusIso"), + hcalPFClusterIsoMap = cms.InputTag("reducedEgamma", "ootPhoHcalPFClusIso")) process.patPhotons.photonSource = cms.InputTag("reducedEgamma","reducedGedPhotons") diff --git a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py index ab9c52343548b..d7a9babadad5a 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py @@ -85,8 +85,8 @@ ) ) -from Configuration.Eras.Modifier_run2_miniAOD_9X_cff import run2_miniAOD_9X -run2_miniAOD_9X.toModify( +from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17 +run2_miniAOD_94XFall17.toModify( reducedEgamma, photonPFClusterIsoSources = cms.VInputTag( cms.InputTag("photonEcalPFClusterIsolationProducer"),