Skip to content

Commit

Permalink
Merge pull request #34371 from jeongeun/egmisolationalogs12X
Browse files Browse the repository at this point in the history 
Migrate module configuration in RecoEgamma{EgammaIsolationAlgos} to use default cfipython
  • Loading branch information
@cmsbuild
cmsbuild committed Jul 7, 2021
2 parents 9a544f7 + c008005 commit 183578e
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 71 deletions.
27 changes: 14 additions & 13 deletions RecoEgamma/EgammaIsolationAlgos/python/egmElectronIsolationPUPPI_cff.py
View file
@@ -1,4 +1,5 @@
import FWCore.ParameterSet.Config as cms
import PhysicsTools.IsolationAlgos.CITKPFIsolationSumProducerForPUPPI_cfi as _mod

IsoConeDefinitions = cms.VPSet(
cms.PSet( isolationAlgo = cms.string('ElectronPFIsolationWithConeVeto'),
Expand All @@ -21,23 +22,23 @@
miniAODVertexCodes = cms.vuint32(2,3) )
)

egmElectronIsolationAODPUPPI = cms.EDProducer( "CITKPFIsolationSumProducerForPUPPI",
srcToIsolate = cms.InputTag("gedGsfElectrons"),
srcForIsolationCone = cms.InputTag(''),
egmElectronIsolationAODPUPPI = _mod.CITKPFIsolationSumProducerForPUPPI.clone(
srcToIsolate = "gedGsfElectrons",
srcForIsolationCone = '',
isolationConeDefinitions = IsoConeDefinitions
)

egmElectronIsolationMiniAODPUPPI = cms.EDProducer( "CITKPFIsolationSumProducerForPUPPI",
srcToIsolate = cms.InputTag("slimmedElectrons"),
srcForIsolationCone = cms.InputTag('packedPFCandidates'),
puppiValueMap = cms.InputTag(''),
egmElectronIsolationMiniAODPUPPI = _mod.CITKPFIsolationSumProducerForPUPPI.clone(
srcToIsolate = "slimmedElectrons",
srcForIsolationCone = 'packedPFCandidates',
puppiValueMap = '',
isolationConeDefinitions = IsoConeDefinitions
)

egmElectronIsolationMiniAODPUPPINoLeptons = cms.EDProducer( "CITKPFIsolationSumProducerForPUPPI",
srcToIsolate = cms.InputTag("slimmedElectrons"),
srcForIsolationCone = cms.InputTag('packedPFCandidates'),
puppiValueMap = cms.InputTag(''),
usePUPPINoLepton = cms.bool(True),
egmElectronIsolationMiniAODPUPPINoLeptons = _mod.CITKPFIsolationSumProducerForPUPPI.clone(
srcToIsolate = "slimmedElectrons",
srcForIsolationCone = 'packedPFCandidates',
puppiValueMap = '',
usePUPPINoLepton = True,
isolationConeDefinitions = IsoConeDefinitions
)
)
8 changes: 4 additions & 4 deletions RecoEgamma/EgammaIsolationAlgos/python/egmPhotonIsolationAOD_cff.py
View file
Expand Up @@ -3,11 +3,11 @@
from CommonTools.ParticleFlow.pfNoPileUpIso_cff import pfPileUpIso, pfNoPileUpIso, pfNoPileUpIsoTask
from RecoEgamma.EgammaIsolationAlgos.egmIsoConeDefinitions_cfi import IsoConeDefinitions as _IsoConeDefinitions
from RecoEgamma.EgammaIsolationAlgos.egmIsolationDefinitions_cff import pfNoPileUpCandidates
import PhysicsTools.IsolationAlgos.CITKPFIsolationSumProducer_cfi as _mod


egmPhotonIsolation = cms.EDProducer( "CITKPFIsolationSumProducer",
srcToIsolate = cms.InputTag("gedPhotons"),
srcForIsolationCone = cms.InputTag('pfNoPileUpCandidates'),
egmPhotonIsolation = _mod.CITKPFIsolationSumProducer.clone(
srcToIsolate = "gedPhotons",
srcForIsolationCone = 'pfNoPileUpCandidates',
isolationConeDefinitions = _IsoConeDefinitions
)

Expand Down
7 changes: 4 additions & 3 deletions RecoEgamma/EgammaIsolationAlgos/python/egmPhotonIsolationMiniAOD_cff.py
View file
@@ -1,10 +1,11 @@
import FWCore.ParameterSet.Config as cms

from RecoEgamma.EgammaIsolationAlgos.egmIsoConeDefinitions_cfi import IsoConeDefinitions as _IsoConeDefinitions
import PhysicsTools.IsolationAlgos.CITKPFIsolationSumProducer_cfi as _mod

egmPhotonIsolation = cms.EDProducer( "CITKPFIsolationSumProducer",
srcToIsolate = cms.InputTag("slimmedPhotons"),
srcForIsolationCone = cms.InputTag('packedPFCandidates'),
egmPhotonIsolation = _mod.CITKPFIsolationSumProducer.clone(
srcToIsolate = "slimmedPhotons",
srcForIsolationCone = 'packedPFCandidates',
isolationConeDefinitions = _IsoConeDefinitions
)

Expand Down
14 changes: 7 additions & 7 deletions RecoEgamma/EgammaIsolationAlgos/python/egmPhotonIsolationPUPPI_cff.py
View file
@@ -1,4 +1,5 @@
import FWCore.ParameterSet.Config as cms
import PhysicsTools.IsolationAlgos.CITKPFIsolationSumProducerForPUPPI_cfi as _mod

IsoConeDefinitions = cms.VPSet(cms.PSet( isolationAlgo = cms.string('PhotonPFIsolationWithMapBasedVeto'),
coneSize = cms.double(0.3),
Expand All @@ -25,15 +26,14 @@
)


egmPhotonIsolationAODPUPPI = cms.EDProducer( "CITKPFIsolationSumProducerForPUPPI",
srcToIsolate = cms.InputTag("gedPhotons"),
srcForIsolationCone = cms.InputTag('particleFlow'),
puppiValueMap = cms.InputTag('puppi'),
egmPhotonIsolationAODPUPPI = _mod.CITKPFIsolationSumProducerForPUPPI.clone(
srcToIsolate = "gedPhotons",
srcForIsolationCone = 'particleFlow',
isolationConeDefinitions = IsoConeDefinitions
)

egmPhotonIsolationMiniAODPUPPI = egmPhotonIsolationAODPUPPI.clone(
srcForIsolationCone = "packedPFCandidates",
srcToIsolate = "slimmedPhotons",
puppiValueMap = ''
srcForIsolationCone = "packedPFCandidates",
srcToIsolate = "slimmedPhotons",
puppiValueMap = ''
)
59 changes: 15 additions & 44 deletions RecoEgamma/EgammaIsolationAlgos/python/pfClusterIsolation_cfi.py
View file
@@ -1,57 +1,28 @@
import FWCore.ParameterSet.Config as cms
import RecoEgamma.EgammaIsolationAlgos.egammaEcalPFClusterIsolationProducerRecoGsfElectron_cfi as _mod_Ecalele
import RecoEgamma.EgammaIsolationAlgos.egammaEcalPFClusterIsolationProducerRecoPhoton_cfi as _mod_Ecalpho
import RecoEgamma.EgammaIsolationAlgos.egammaHcalPFClusterIsolationProducerRecoGsfElectron_cfi as _mod_Hcalele
import RecoEgamma.EgammaIsolationAlgos.egammaHcalPFClusterIsolationProducerRecoPhoton_cfi as _mod_Hcalpho

electronEcalPFClusterIsolationProducer = cms.EDProducer('ElectronEcalPFClusterIsolationProducer',
candidateProducer = cms.InputTag('gedGsfElectronsTmp'),
pfClusterProducer = cms.InputTag('particleFlowClusterECAL'),
drMax = cms.double(0.3),
drVetoBarrel = cms.double(0),
drVetoEndcap = cms.double(0),
etaStripBarrel = cms.double(0),
etaStripEndcap = cms.double(0),
energyBarrel = cms.double(0),
energyEndcap = cms.double(0)
)
electronEcalPFClusterIsolationProducer = _mod_Ecalele.egammaEcalPFClusterIsolationProducerRecoGsfElectron.clone(
candidateProducer = 'gedGsfElectronsTmp',
)

photonEcalPFClusterIsolationProducer = cms.EDProducer('PhotonEcalPFClusterIsolationProducer',
candidateProducer = cms.InputTag('gedPhotonsTmp'),
pfClusterProducer = cms.InputTag('particleFlowClusterECAL'),
drMax = cms.double(0.3),
drVetoBarrel = cms.double(0),
drVetoEndcap = cms.double(0),
etaStripBarrel = cms.double(0),
etaStripEndcap = cms.double(0),
energyBarrel = cms.double(0),
energyEndcap = cms.double(0)
photonEcalPFClusterIsolationProducer = _mod_Ecalpho.egammaEcalPFClusterIsolationProducerRecoPhoton.clone(
candidateProducer = 'gedPhotonsTmp',
)

ootPhotonEcalPFClusterIsolationProducer = photonEcalPFClusterIsolationProducer.clone(
candidateProducer = 'ootPhotonsTmp',
pfClusterProducer = 'particleFlowClusterOOTECAL'
)
electronHcalPFClusterIsolationProducer = cms.EDProducer('ElectronHcalPFClusterIsolationProducer',
candidateProducer = cms.InputTag('gedGsfElectronsTmp'),
pfClusterProducerHCAL = cms.InputTag('particleFlowClusterHCAL'),
useHF = cms.bool(False),
drMax = cms.double(0.3),
drVetoBarrel = cms.double(0),
drVetoEndcap = cms.double(0),
etaStripBarrel = cms.double(0),
etaStripEndcap = cms.double(0),
energyBarrel = cms.double(0),
energyEndcap = cms.double(0)
)

photonHcalPFClusterIsolationProducer = cms.EDProducer('PhotonHcalPFClusterIsolationProducer',
candidateProducer = cms.InputTag('gedPhotonsTmp'),
pfClusterProducerHCAL = cms.InputTag('particleFlowClusterHCAL'),
useHF = cms.bool(False),
drMax = cms.double(0.3),
drVetoBarrel = cms.double(0),
drVetoEndcap = cms.double(0),
etaStripBarrel = cms.double(0),
etaStripEndcap = cms.double(0),
energyBarrel = cms.double(0),
energyEndcap = cms.double(0)
electronHcalPFClusterIsolationProducer = _mod_Hcalele.egammaHcalPFClusterIsolationProducerRecoGsfElectron.clone(
candidateProducer = 'gedGsfElectronsTmp',
)

photonHcalPFClusterIsolationProducer = _mod_Hcalpho.egammaHcalPFClusterIsolationProducerRecoPhoton.clone(
candidateProducer = 'gedPhotonsTmp',
)

ootPhotonHcalPFClusterIsolationProducer = photonHcalPFClusterIsolationProducer.clone(
Expand Down

0 comments on commit 183578e

Please sign in to comment.