From f03d421df81ada3c00fba0c7014df8b9495a1614 Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Fri, 13 Oct 2017 05:23:08 +0200 Subject: [PATCH 01/10] fix the pp_on_XeXe_2017 era to run and store island photons --- RecoEcal/Configuration/python/RecoEcal_cff.py | 6 ++++++ .../python/RecoEgamma_EventContent_cff.py | 4 +++- RecoEgamma/Configuration/python/RecoEgamma_cff.py | 3 ++- .../EgammaPhotonProducers/python/photonCore_cfi.py | 2 +- .../EgammaPhotonProducers/python/photonSequence_cff.py | 10 +++++----- RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py | 2 +- .../python/photonIsolationHIProducer_cfi.py | 6 +++++- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/RecoEcal/Configuration/python/RecoEcal_cff.py b/RecoEcal/Configuration/python/RecoEcal_cff.py index e3bd0163e65eb..df2c6ed9b3d22 100644 --- a/RecoEcal/Configuration/python/RecoEcal_cff.py +++ b/RecoEcal/Configuration/python/RecoEcal_cff.py @@ -26,8 +26,14 @@ from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import islandBasicClusters +from RecoHI.HiEgammaAlgos.HiIslandSuperClusters_cfi import islandSuperClusters +from RecoHI.HiEgammaAlgos.HiCorrectedIslandBarrelSuperClusters_cfi import correctedIslandBarrelSuperClusters +from RecoHI.HiEgammaAlgos.HiCorrectedIslandEndcapSuperClusters_cfi import correctedIslandEndcapSuperClusters _ecalClustersHI = ecalClusters.copy() _ecalClustersHI += islandBasicClusters +_ecalClustersHI += islandSuperClusters +_ecalClustersHI += correctedIslandBarrelSuperClusters +_ecalClustersHI += correctedIslandEndcapSuperClusters for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: e.toReplaceWith(ecalClusters, _ecalClustersHI) diff --git a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py index c7f1c7a4690a6..4470b249ff0dd 100644 --- a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py +++ b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py @@ -183,6 +183,8 @@ for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: for ec in [RecoEgammaAOD.outputCommands, RecoEgammaRECO.outputCommands, RecoEgammaFEVT.outputCommands]: e.toModify( ec, func=lambda outputCommands: outputCommands.extend(['keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerppGED_*_*', - 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerpp_*_*' + 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerpp_*_*', + 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerppIsland_*_*', + 'keep recoPhotons_islandPhotons_*_*' ]) ) diff --git a/RecoEgamma/Configuration/python/RecoEgamma_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_cff.py index 020cdcb6677d1..09aaced8c1c1e 100644 --- a/RecoEgamma/Configuration/python/RecoEgamma_cff.py +++ b/RecoEgamma/Configuration/python/RecoEgamma_cff.py @@ -44,12 +44,13 @@ from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 #HI-specific algorithms needed in pp scenario special configurations -from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import islandBasicClusters from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducerpp from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducerppGED +from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducerppIsland _egammaHighLevelRecoPostPF_HI = egammaHighLevelRecoPostPF.copy() _egammaHighLevelRecoPostPF_HI += photonIsolationHIProducerpp _egammaHighLevelRecoPostPF_HI += photonIsolationHIProducerppGED +_egammaHighLevelRecoPostPF_HI += photonIsolationHIProducerppIsland for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: e.toReplaceWith(egammaHighLevelRecoPostPF, _egammaHighLevelRecoPostPF_HI) diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py index 5f4477930658d..9bfef9ac6c9b6 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py @@ -21,7 +21,7 @@ pixelSeedProducer = 'electronMergedSeedsFromMultiCl' ) -photonCoreIsland = photonCore.clone( +islandPhotonCore = photonCore.clone( scHybridBarrelProducer = "correctedIslandBarrelSuperClusters", scIslandEndcapProducer = "correctedIslandEndcapSuperClusters", minSCEt = 8.0 diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py index 80b89e657003e..aad56e6df767a 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py @@ -11,7 +11,7 @@ _photonSequenceFromMultiCl = photonSequence.copy() _photonSequenceFromMultiCl += ( photonCoreFromMultiCl + photonsFromMultiCl) _photonSequenceWithIsland = photonSequence.copy() -_photonSequenceWithIsland += ( photonCoreIsland + photonsIsland) +_photonSequenceWithIsland += ( islandPhotonCore + islandPhotons ) from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal @@ -19,8 +19,8 @@ photonSequence, _photonSequenceFromMultiCl ) +from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 +from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -pp_on_XeXe_2017.toReplaceWith( - photonSequence, _photonSequenceWithIsland -) - +for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: + e.toReplaceWith(photonSequence, _photonSequenceWithIsland) diff --git a/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py index 3833158e5fcfb..0102eb1cdc51f 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py @@ -84,7 +84,7 @@ photonProducer = 'photonCoreFromMultiCl' ) -photonsIsland = photons.clone( +islandPhotons = photons.clone( photonProducer = "islandPhotonCore", minSCEtBarrel = 5.0, minSCEtEndcap = 15.0, diff --git a/RecoHI/HiEgammaAlgos/python/photonIsolationHIProducer_cfi.py b/RecoHI/HiEgammaAlgos/python/photonIsolationHIProducer_cfi.py index e02e9a3dcd2f3..399ed1c19cfbe 100644 --- a/RecoHI/HiEgammaAlgos/python/photonIsolationHIProducer_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/photonIsolationHIProducer_cfi.py @@ -22,9 +22,13 @@ photonProducer=cms.InputTag("gedPhotons") ) +photonIsolationHIProducerppIsland = photonIsolationHIProducerpp.clone( +photonProducer=cms.InputTag("islandPhotons") +) + from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import * islandBasicClustersGED = islandBasicClusters.clone() photonIsolationHISequence = cms.Sequence(islandBasicClusters * photonIsolationHIProducerpp) photonIsolationHISequenceGED = cms.Sequence(islandBasicClustersGED * photonIsolationHIProducerppGED) - +photonIsolationHISequenceIsland = cms.Sequence(islandBasicClusters * photonIsolationHIProducerppIsland) From 05ae264dda2ffbf0a4c524586e23ccf505986695 Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Fri, 13 Oct 2017 05:56:53 +0200 Subject: [PATCH 02/10] use standard PhotonProducer for island photons --- .../python/photons_cfi.py | 72 ++++++++++++++++--- 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py index 0102eb1cdc51f..75b237bad14cc 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py @@ -84,12 +84,68 @@ photonProducer = 'photonCoreFromMultiCl' ) -islandPhotons = photons.clone( - photonProducer = "islandPhotonCore", - minSCEtBarrel = 5.0, - minSCEtEndcap = 15.0, - minR9Barrel = 10., - minR9Endcap = 10., - maxHoverEEndcap = 0.5, - maxHoverEBarrel = 0.99 +islandPhotons = cms.EDProducer("PhotonProducer", + photonCoreProducer = cms.InputTag("islandPhotonCore"), + regressionWeightsFromDB = cms.bool(True), + energyRegressionWeightsFileLocation = cms.string('/afs/cern.ch/user/b/bendavid/cmspublic/regweights/gbrph.root'), + energyRegressionWeightsDBLocation = cms.string('wgbrph'), + superClusterEnergyCorrFunction = cms.string("EcalClusterEnergyCorrection"), + superClusterEnergyErrorFunction = cms.string("EcalClusterEnergyUncertainty"), + superClusterCrackEnergyCorrFunction = cms.string("EcalClusterCrackCorrection"), + photonEcalEnergyCorrFunction = cms.string("EcalClusterEnergyCorrectionObjectSpecific"), + candidateP4type = cms.string("fromEcalEnergy"), + isolationSumsCalculatorSet = cms.PSet(isolationSumsCalculator), + mipVariableSet = cms.PSet(mipVariable), + usePrimaryVertex = cms.bool(True), + primaryVertexProducer = cms.InputTag('offlinePrimaryVerticesWithBS'), + posCalc_t0_endcPresh = cms.double(3.6), + posCalc_logweight = cms.bool(True), + posCalc_w0 = cms.double(4.2), + hbheInstance = cms.string(''), + posCalc_t0_endc = cms.double(6.3), + barrelEcalHits = cms.InputTag("ecalRecHit","EcalRecHitsEB"), + hbheModule = cms.string('hbhereco'), + endcapEcalHits = cms.InputTag("ecalRecHit","EcalRecHitsEE"), + hcalTowers = cms.InputTag("towerMaker"), + runMIPTagger = cms.bool(True), + highEt = cms.double(100.), + minR9Barrel = cms.double(10.0), + minR9Endcap = cms.double(10.0), + hOverEConeSize = cms.double(0.15), + posCalc_x0 = cms.double(0.89), + posCalc_t0_barl = cms.double(7.7), + minSCEtBarrel = cms.double(5.0), + minSCEtEndcap = cms.double(15.0), + maxHoverEBarrel = cms.double(0.99), + maxHoverEEndcap = cms.double(0.5), + ecalRecHitSumEtOffsetBarrel = cms.double(999999999), + ecalRecHitSumEtSlopeBarrel = cms.double(0.), + ecalRecHitSumEtOffsetEndcap = cms.double(999999999), + ecalRecHitSumEtSlopeEndcap = cms.double(0.), + hcalTowerSumEtOffsetBarrel = cms.double(999999999), + hcalTowerSumEtSlopeBarrel = cms.double(0.), + hcalTowerSumEtOffsetEndcap = cms.double(999999999), + hcalTowerSumEtSlopeEndcap = cms.double(0.), + nTrackSolidConeBarrel =cms.double(999999999), + nTrackSolidConeEndcap =cms.double(999999999), + nTrackHollowConeBarrel =cms.double(999999999), + nTrackHollowConeEndcap =cms.double(999999999), + trackPtSumSolidConeBarrel =cms.double(999999999), + trackPtSumSolidConeEndcap =cms.double(999999999), + trackPtSumHollowConeBarrel =cms.double(999999999), + trackPtSumHollowConeEndcap =cms.double(999999999), + sigmaIetaIetaCutBarrel=cms.double(999999999), + sigmaIetaIetaCutEndcap=cms.double(999999999), + posCalcParameters = cms.PSet( T0_barl = cms.double(7.4), + T0_endc = cms.double(6.3), + T0_endcPresh = cms.double(3.6), + LogWeighted = cms.bool(True), + W0 = cms.double(4.2), + X0 = cms.double(0.89) + ), + + RecHitFlagToBeExcludedEB = cleanedHybridSuperClusters.RecHitFlagToBeExcluded, + RecHitSeverityToBeExcludedEB = cleanedHybridSuperClusters.RecHitSeverityToBeExcluded, + RecHitFlagToBeExcludedEE = multi5x5BasicClustersCleaned.RecHitFlagToBeExcluded, + RecHitSeverityToBeExcludedEE = cleanedHybridSuperClusters.RecHitSeverityToBeExcluded, ) From 7d38e46ae4192b75fa024405248d013dd7ea7eac Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Wed, 25 Oct 2017 02:25:39 +0200 Subject: [PATCH 03/10] rename HI-specific islandSuperClusters modules to remove the "same name" ambiguity with the modules under RecoEcal/EgammaClusterProducers/ --- .../python/Reconstruction_hiSignal_cff.py | 8 ++++---- .../python/HiCorrectedIslandBarrelSuperClusters_cfi.py | 4 ++-- .../python/HiCorrectedIslandEndcapSuperClusters_cfi.py | 4 ++-- RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py | 6 +++--- .../python/HiIslandClusteringSequence_cff.py | 2 +- .../HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py | 6 +++--- .../python/RecoHiEgamma_EventContent_cff.py | 10 +++++----- RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/RecoHI/Configuration/python/Reconstruction_hiSignal_cff.py b/RecoHI/Configuration/python/Reconstruction_hiSignal_cff.py index 06a42f28b0996..898b5c83945e3 100644 --- a/RecoHI/Configuration/python/Reconstruction_hiSignal_cff.py +++ b/RecoHI/Configuration/python/Reconstruction_hiSignal_cff.py @@ -21,11 +21,11 @@ ) #Ecal -hiSignalCorrectedIslandBarrelSuperClusters = correctedIslandBarrelSuperClusters.clone() -hiSignalCorrectedIslandEndcapSuperClusters = correctedIslandEndcapSuperClusters.clone() +hiSignalCorrectedIslandBarrelSuperClusters = hiCorrectedIslandBarrelSuperClusters.clone() +hiSignalCorrectedIslandEndcapSuperClusters = hiCorrectedIslandEndcapSuperClusters.clone() -islandClusteringSequence = cms.Sequence(islandBasicClusters - *islandSuperClusters +hiIslandClusteringSequence = cms.Sequence(islandBasicClusters + *hiIslandSuperClusters *hiSignalCorrectedIslandBarrelSuperClusters *hiSignalCorrectedIslandEndcapSuperClusters ) diff --git a/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandBarrelSuperClusters_cfi.py b/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandBarrelSuperClusters_cfi.py index 3edee65e726a6..c1ee585b8a26a 100644 --- a/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandBarrelSuperClusters_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandBarrelSuperClusters_cfi.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms # Energy scale correction for Island SuperClusters -correctedIslandBarrelSuperClusters = cms.EDProducer("HiEgammaSCCorrectionMaker", +hiCorrectedIslandBarrelSuperClusters = cms.EDProducer("HiEgammaSCCorrectionMaker", corectedSuperClusterCollection = cms.string(''), sigmaElectronicNoise = cms.double(0.03), superClusterAlgo = cms.string('Island'), etThresh = cms.double(0.0), - rawSuperClusterProducer = cms.InputTag("islandSuperClusters","islandBarrelSuperClusters"), + rawSuperClusterProducer = cms.InputTag("hiIslandSuperClusters","hiIslandBarrelSuperClusters"), applyEnergyCorrection = cms.bool(True), isl_fCorrPset = cms.PSet( fEtaVect = cms.vdouble(0.993,0,0.00546,1.165,-0.180844,+0.040312), diff --git a/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandEndcapSuperClusters_cfi.py b/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandEndcapSuperClusters_cfi.py index 5c092143f565b..7c2675073d31d 100644 --- a/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandEndcapSuperClusters_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandEndcapSuperClusters_cfi.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms # Energy scale correction for Island Endcap SuperClusters -correctedIslandEndcapSuperClusters = cms.EDProducer("HiEgammaSCCorrectionMaker", +hiCorrectedIslandEndcapSuperClusters = cms.EDProducer("HiEgammaSCCorrectionMaker", corectedSuperClusterCollection = cms.string(''), sigmaElectronicNoise = cms.double(0.15), superClusterAlgo = cms.string('Island'), etThresh = cms.double(0.0), - rawSuperClusterProducer = cms.InputTag("islandSuperClusters","islandEndcapSuperClusters"), + rawSuperClusterProducer = cms.InputTag("hiIslandSuperClusters","hiIslandEndcapSuperClusters"), applyEnergyCorrection = cms.bool(True), isl_fCorrPset = cms.PSet( fEtaVect = cms.vdouble(0.993,0,0.00546,1.165,-0.180844,+0.040312), diff --git a/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py b/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py index f2018f55a6c97..4459744098998 100644 --- a/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py +++ b/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py @@ -11,15 +11,15 @@ particleFlowSuperClusterECAL.regressionConfig.vertexCollection = 'hiSelectedVertex' -hiEcalClusteringSequence = cms.Sequence(islandClusteringSequence*hybridClusteringSequence*multi5x5ClusteringSequence*multi5x5PreshowerClusteringSequence*preshowerClusteringSequence*particleFlowSuperClusteringSequence) +hiEcalClusteringSequence = cms.Sequence(hiIslandClusteringSequence*hybridClusteringSequence*multi5x5ClusteringSequence*multi5x5PreshowerClusteringSequence*preshowerClusteringSequence*particleFlowSuperClusteringSequence) # reco photon producer from RecoEgamma.EgammaPhotonProducers.photonSequence_cff import * # use island for the moment -photonCore.scHybridBarrelProducer = cms.InputTag("correctedIslandBarrelSuperClusters") -photonCore.scIslandEndcapProducer = cms.InputTag("correctedIslandEndcapSuperClusters") +photonCore.scHybridBarrelProducer = cms.InputTag("hiCorrectedIslandBarrelSuperClusters") +photonCore.scIslandEndcapProducer = cms.InputTag("hiCorrectedIslandEndcapSuperClusters") photonCore.minSCEt = cms.double(8.0) photons.minSCEtBarrel = cms.double(5.0) photons.minSCEtEndcap = cms.double(15.0) diff --git a/RecoHI/HiEgammaAlgos/python/HiIslandClusteringSequence_cff.py b/RecoHI/HiEgammaAlgos/python/HiIslandClusteringSequence_cff.py index b5119a50287ea..1b2a603b3fcfa 100644 --- a/RecoHI/HiEgammaAlgos/python/HiIslandClusteringSequence_cff.py +++ b/RecoHI/HiEgammaAlgos/python/HiIslandClusteringSequence_cff.py @@ -13,5 +13,5 @@ from RecoHI.HiEgammaAlgos.HiCorrectedIslandBarrelSuperClusters_cfi import * from RecoHI.HiEgammaAlgos.HiCorrectedIslandEndcapSuperClusters_cfi import * # create sequence for island clustering -islandClusteringSequence = cms.Sequence(islandBasicClusters*islandSuperClusters*correctedIslandBarrelSuperClusters*correctedIslandEndcapSuperClusters) +hiIslandClusteringSequence = cms.Sequence(islandBasicClusters*hiIslandSuperClusters*hiCorrectedIslandBarrelSuperClusters*hiCorrectedIslandEndcapSuperClusters) diff --git a/RecoHI/HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py b/RecoHI/HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py index fa0d4ab55471d..7cce51d0617f4 100644 --- a/RecoHI/HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py @@ -3,8 +3,8 @@ # # # Island SuperCluster producer -islandSuperClusters = cms.EDProducer("HiSuperClusterProducer", - barrelSuperclusterCollection = cms.string('islandBarrelSuperClusters'), +hiIslandSuperClusters = cms.EDProducer("HiSuperClusterProducer", + barrelSuperclusterCollection = cms.string('hiIslandBarrelSuperClusters'), endcapEtaSearchRoad = cms.double(0.14), barrelClusterCollection = cms.string('islandBarrelBasicClusters'), endcapClusterProducer = cms.string('islandBasicClusters'), @@ -14,7 +14,7 @@ seedTransverseEnergyThreshold = cms.double(1.0), barrelBCEnergyThreshold = cms.double(0), endcapBCEnergyThreshold = cms.double(0), - endcapSuperclusterCollection = cms.string('islandEndcapSuperClusters'), + endcapSuperclusterCollection = cms.string('hiIslandEndcapSuperClusters'), barrelEtaSearchRoad = cms.double(0.07), doBarrel = cms.bool(True), doEndcaps = cms.bool(True), diff --git a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py b/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py index ea63a3717e6f5..efb6d838997c7 100644 --- a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py +++ b/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py @@ -26,11 +26,11 @@ 'keep recoSuperCluster_cleanedHybridSuperClusters_*_*', 'keep recoSuperCluster_correctedEndcapSuperClustersWithPreshower_*_*', 'keep recoSuperCluster_correctedHybridSuperClusters_*_*', - 'keep recoSuperCluster_correctedIslandBarrelSuperClusters_*_*', - 'keep recoSuperCluster_correctedIslandEndcapSuperClusters_*_*', + 'keep recoSuperCluster_hiCorrectedIslandBarrelSuperClusters_*_*', + 'keep recoSuperCluster_hiCorrectedIslandEndcapSuperClusters_*_*', 'keep recoSuperCluster_correctedMulti5x5SuperClustersWithPreshower_*_*', 'keep recoSuperCluster_hybridSuperClusters_*_*', - 'keep recoSuperCluster_islandSuperClusters_*_*', + 'keep recoSuperCluster_hiIslandSuperClusters_*_*', 'keep recoSuperCluster_mergedSuperClusters_*_*', 'keep recoSuperCluster_multi5x5SuperClusters_*_*', 'keep recoSuperCluster_multi5x5SuperClustersCleaned_*_*', @@ -93,8 +93,8 @@ outputCommands = cms.untracked.vstring( 'keep floatedmValueMap_*_*_*', 'keep recoGsfElectrons_gedGsfElectronsTmp_*_*', - 'keep recoSuperClusters_correctedIslandBarrelSuperClusters_*_*', - 'keep recoSuperClusters_correctedIslandEndcapSuperClusters_*_*', + 'keep recoSuperClusters_hiCorrectedIslandBarrelSuperClusters_*_*', + 'keep recoSuperClusters_hiCorrectedIslandEndcapSuperClusters_*_*', 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducer_*_*', 'keep recoPhotons_gedPhotonsTmp_*_*', 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerGED_*_*', diff --git a/RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py b/RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py index 63544044e303b..6b91cfa0b7ec1 100644 --- a/RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py @@ -3,7 +3,7 @@ hiSpikeCleaner = cms.EDProducer("HiSpikeCleaner", recHitProducerBarrel = cms.InputTag("ecalRecHit","EcalRecHitsEB"), recHitProducerEndcap = cms.InputTag("ecalRecHit","EcalRecHitsEE"), - originalSuperClusterProducer = cms.InputTag("correctedIslandBarrelSuperClusters"), + originalSuperClusterProducer = cms.InputTag("hiCorrectedIslandBarrelSuperClusters"), outputColl = cms.string( "" ), etCut = cms.double(10), TimingCut = cms.untracked.double(4.0), From 5e3dedfe504a380ba6b976461cd23bfdead3d43d Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Wed, 25 Oct 2017 02:30:26 +0200 Subject: [PATCH 04/10] propagate the changes for pp_on_XeXe_2017 era after renaming HI-specific islandSuperClusters modules --- RecoEcal/Configuration/python/RecoEcal_cff.py | 10 ++-------- .../EgammaPhotonProducers/python/photonCore_cfi.py | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/RecoEcal/Configuration/python/RecoEcal_cff.py b/RecoEcal/Configuration/python/RecoEcal_cff.py index df2c6ed9b3d22..a7572e443b066 100644 --- a/RecoEcal/Configuration/python/RecoEcal_cff.py +++ b/RecoEcal/Configuration/python/RecoEcal_cff.py @@ -25,15 +25,9 @@ from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import islandBasicClusters -from RecoHI.HiEgammaAlgos.HiIslandSuperClusters_cfi import islandSuperClusters -from RecoHI.HiEgammaAlgos.HiCorrectedIslandBarrelSuperClusters_cfi import correctedIslandBarrelSuperClusters -from RecoHI.HiEgammaAlgos.HiCorrectedIslandEndcapSuperClusters_cfi import correctedIslandEndcapSuperClusters +from RecoHI.HiEgammaAlgos.HiIslandClusteringSequence_cff import * _ecalClustersHI = ecalClusters.copy() -_ecalClustersHI += islandBasicClusters -_ecalClustersHI += islandSuperClusters -_ecalClustersHI += correctedIslandBarrelSuperClusters -_ecalClustersHI += correctedIslandEndcapSuperClusters +_ecalClustersHI += hiIslandClusteringSequence for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: e.toReplaceWith(ecalClusters, _ecalClustersHI) diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py index 9bfef9ac6c9b6..67d81b86b2899 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py @@ -22,7 +22,7 @@ ) islandPhotonCore = photonCore.clone( - scHybridBarrelProducer = "correctedIslandBarrelSuperClusters", - scIslandEndcapProducer = "correctedIslandEndcapSuperClusters", + scHybridBarrelProducer = "hiCorrectedIslandBarrelSuperClusters", + scIslandEndcapProducer = "hiCorrectedIslandEndcapSuperClusters", minSCEt = 8.0 ) From 3c86e0e55524efe6b6a0b8c8c0aacca37ef8a377 Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Wed, 25 Oct 2017 08:37:18 +0200 Subject: [PATCH 05/10] propagate the changes to ValidationHeavyIons renaming HI-specific islandSuperClusters modules --- Validation/RecoHI/python/globalValidationHeavyIons_cff.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Validation/RecoHI/python/globalValidationHeavyIons_cff.py b/Validation/RecoHI/python/globalValidationHeavyIons_cff.py index 4222bbb1c8bd0..e88856b95e5c1 100644 --- a/Validation/RecoHI/python/globalValidationHeavyIons_cff.py +++ b/Validation/RecoHI/python/globalValidationHeavyIons_cff.py @@ -14,11 +14,11 @@ egammaBasicClusterAnalyzer.barrelBasicClusterCollection = cms.InputTag("islandBasicClusters","islandBarrelBasicClusters") egammaBasicClusterAnalyzer.endcapBasicClusterCollection = cms.InputTag("islandBasicClusters","islandEndcapBasicClusters") egammaSuperClusterAnalyzer.barrelRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB") -egammaSuperClusterAnalyzer.barrelRawSuperClusterCollection = cms.InputTag("islandSuperClusters","islandBarrelSuperClusters") -egammaSuperClusterAnalyzer.barrelCorSuperClusterCollection = cms.InputTag("correctedIslandBarrelSuperClusters") +egammaSuperClusterAnalyzer.barrelRawSuperClusterCollection = cms.InputTag("hiIslandSuperClusters","hiIslandBarrelSuperClusters") +egammaSuperClusterAnalyzer.barrelCorSuperClusterCollection = cms.InputTag("hiCorrectedIslandBarrelSuperClusters") egammaSuperClusterAnalyzer.endcapRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE") -egammaSuperClusterAnalyzer.endcapRawSuperClusterCollection = cms.InputTag("islandSuperClusters","islandEndcapSuperClusters") -egammaSuperClusterAnalyzer.endcapCorSuperClusterCollection = cms.InputTag("correctedIslandEndcapSuperClusters") +egammaSuperClusterAnalyzer.endcapRawSuperClusterCollection = cms.InputTag("hiIslandSuperClusters","hiIslandEndcapSuperClusters") +egammaSuperClusterAnalyzer.endcapCorSuperClusterCollection = cms.InputTag("hiCorrectedIslandEndcapSuperClusters") #egammaSuperClusterAnalyzer.endcapPreSuperClusterCollection = cms.InputTag("islandEndcapSuperClustersWithPreshower") #to be implemented: only multi5x5 for now From 0200b593b02aecf2bd4526147164cee49d48a22d Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Thu, 26 Oct 2017 17:28:27 +0200 Subject: [PATCH 06/10] add temporary customization for renaming HI-specific islandSuperClusters modules --- HLTrigger/Configuration/python/customizeHLTforCMSSW.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 150d29cd25230..c2c05a730d0a6 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -63,6 +63,13 @@ def customiseFor20429(process): del producer.GBRForestFileName return process +# rename HI-specific islandSuperClusters modules +def customiseFor20929(process): + for producer in producers_by_type(process, "PreshowerClusterProducer"): + if hasattr(producer, "endcapSClusterProducer"): + producer.endcapSClusterProducer = cms.InputTag("hiCorrectedIslandEndcapSuperClusters") + return process + # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -74,5 +81,7 @@ def customizeHLTforCMSSW(process, menuType="GRun"): process = customiseFor19989(process) process = customiseFor20422(process) process = customiseFor20429(process) + if (menuType == "HIon"): + process = customiseFor20929(process) return process From efcf76731459a630191bf2cb3c767653dae9e801 Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Fri, 27 Oct 2017 02:09:27 +0200 Subject: [PATCH 07/10] revert "add temporary customization for renaming HI-specific islandSuperClusters modules" as suggested here https://github.com/cms-sw/cmssw/pull/20929#issuecomment-339795218 --- HLTrigger/Configuration/python/customizeHLTforCMSSW.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index c2c05a730d0a6..150d29cd25230 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -63,13 +63,6 @@ def customiseFor20429(process): del producer.GBRForestFileName return process -# rename HI-specific islandSuperClusters modules -def customiseFor20929(process): - for producer in producers_by_type(process, "PreshowerClusterProducer"): - if hasattr(producer, "endcapSClusterProducer"): - producer.endcapSClusterProducer = cms.InputTag("hiCorrectedIslandEndcapSuperClusters") - return process - # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -81,7 +74,5 @@ def customizeHLTforCMSSW(process, menuType="GRun"): process = customiseFor19989(process) process = customiseFor20422(process) process = customiseFor20429(process) - if (menuType == "HIon"): - process = customiseFor20929(process) return process From 3335c0295cf22245d6e5da87fce6684966cf1182 Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Fri, 27 Oct 2017 02:10:04 +0200 Subject: [PATCH 08/10] propagate the renaming of HI-specific islandSuperClusters modules to correctedEndcapSuperClustersWithPreshower required by this change https://github.com/cms-sw/cmssw/pull/20929/commits/7d38e46ae4192b75fa024405248d013dd7ea7eac --- RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py | 7 ++++++- .../HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py b/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py index 4459744098998..75b43dd805f2b 100644 --- a/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py +++ b/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py @@ -11,7 +11,12 @@ particleFlowSuperClusterECAL.regressionConfig.vertexCollection = 'hiSelectedVertex' -hiEcalClusteringSequence = cms.Sequence(hiIslandClusteringSequence*hybridClusteringSequence*multi5x5ClusteringSequence*multi5x5PreshowerClusteringSequence*preshowerClusteringSequence*particleFlowSuperClusteringSequence) +hiCorrectedEndcapSuperClustersWithPreshower = correctedEndcapSuperClustersWithPreshower.clone( + endcapSClusterProducer = cms.InputTag("hiCorrectedIslandEndcapSuperClusters") +) +hiPreshowerClusteringSequence = cms.Sequence(hiCorrectedEndcapSuperClustersWithPreshower*preshowerClusterShape) + +hiEcalClusteringSequence = cms.Sequence(hiIslandClusteringSequence*hybridClusteringSequence*multi5x5ClusteringSequence*multi5x5PreshowerClusteringSequence*hiPreshowerClusteringSequence*particleFlowSuperClusteringSequence) # reco photon producer diff --git a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py b/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py index efb6d838997c7..ce3e537f50d04 100644 --- a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py +++ b/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py @@ -24,7 +24,7 @@ outputCommands = cms.untracked.vstring( #'keep recoSuperClusters_*_*_*', 'keep recoSuperCluster_cleanedHybridSuperClusters_*_*', - 'keep recoSuperCluster_correctedEndcapSuperClustersWithPreshower_*_*', + 'keep recoSuperCluster_hiCorrectedEndcapSuperClustersWithPreshower_*_*', 'keep recoSuperCluster_correctedHybridSuperClusters_*_*', 'keep recoSuperCluster_hiCorrectedIslandBarrelSuperClusters_*_*', 'keep recoSuperCluster_hiCorrectedIslandEndcapSuperClusters_*_*', From 0af09c4bee45b3f2e65f0e237fb0b578d897f0d9 Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Fri, 27 Oct 2017 20:10:22 +0200 Subject: [PATCH 09/10] revert "rename HI-specific islandSuperClusters modules" specifically revert all commits starting from here https://github.com/cms-sw/cmssw/pull/20929/commits/7d38e46ae4192b75fa024405248d013dd7ea7eac This revert is suggested here https://github.com/cms-sw/cmssw/pull/20929#issuecomment-340003900 --- RecoEcal/Configuration/python/RecoEcal_cff.py | 10 ++++++++-- .../EgammaPhotonProducers/python/photonCore_cfi.py | 4 ++-- .../python/Reconstruction_hiSignal_cff.py | 8 ++++---- .../HiCorrectedIslandBarrelSuperClusters_cfi.py | 4 ++-- .../HiCorrectedIslandEndcapSuperClusters_cfi.py | 4 ++-- RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py | 11 +++-------- .../python/HiIslandClusteringSequence_cff.py | 2 +- .../python/HiIslandSuperClusters_cfi.py | 6 +++--- .../python/RecoHiEgamma_EventContent_cff.py | 12 ++++++------ RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py | 2 +- .../RecoHI/python/globalValidationHeavyIons_cff.py | 8 ++++---- 11 files changed, 36 insertions(+), 35 deletions(-) diff --git a/RecoEcal/Configuration/python/RecoEcal_cff.py b/RecoEcal/Configuration/python/RecoEcal_cff.py index a7572e443b066..df2c6ed9b3d22 100644 --- a/RecoEcal/Configuration/python/RecoEcal_cff.py +++ b/RecoEcal/Configuration/python/RecoEcal_cff.py @@ -25,9 +25,15 @@ from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from RecoHI.HiEgammaAlgos.HiIslandClusteringSequence_cff import * +from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import islandBasicClusters +from RecoHI.HiEgammaAlgos.HiIslandSuperClusters_cfi import islandSuperClusters +from RecoHI.HiEgammaAlgos.HiCorrectedIslandBarrelSuperClusters_cfi import correctedIslandBarrelSuperClusters +from RecoHI.HiEgammaAlgos.HiCorrectedIslandEndcapSuperClusters_cfi import correctedIslandEndcapSuperClusters _ecalClustersHI = ecalClusters.copy() -_ecalClustersHI += hiIslandClusteringSequence +_ecalClustersHI += islandBasicClusters +_ecalClustersHI += islandSuperClusters +_ecalClustersHI += correctedIslandBarrelSuperClusters +_ecalClustersHI += correctedIslandEndcapSuperClusters for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: e.toReplaceWith(ecalClusters, _ecalClustersHI) diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py index 67d81b86b2899..9bfef9ac6c9b6 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py @@ -22,7 +22,7 @@ ) islandPhotonCore = photonCore.clone( - scHybridBarrelProducer = "hiCorrectedIslandBarrelSuperClusters", - scIslandEndcapProducer = "hiCorrectedIslandEndcapSuperClusters", + scHybridBarrelProducer = "correctedIslandBarrelSuperClusters", + scIslandEndcapProducer = "correctedIslandEndcapSuperClusters", minSCEt = 8.0 ) diff --git a/RecoHI/Configuration/python/Reconstruction_hiSignal_cff.py b/RecoHI/Configuration/python/Reconstruction_hiSignal_cff.py index 898b5c83945e3..06a42f28b0996 100644 --- a/RecoHI/Configuration/python/Reconstruction_hiSignal_cff.py +++ b/RecoHI/Configuration/python/Reconstruction_hiSignal_cff.py @@ -21,11 +21,11 @@ ) #Ecal -hiSignalCorrectedIslandBarrelSuperClusters = hiCorrectedIslandBarrelSuperClusters.clone() -hiSignalCorrectedIslandEndcapSuperClusters = hiCorrectedIslandEndcapSuperClusters.clone() +hiSignalCorrectedIslandBarrelSuperClusters = correctedIslandBarrelSuperClusters.clone() +hiSignalCorrectedIslandEndcapSuperClusters = correctedIslandEndcapSuperClusters.clone() -hiIslandClusteringSequence = cms.Sequence(islandBasicClusters - *hiIslandSuperClusters +islandClusteringSequence = cms.Sequence(islandBasicClusters + *islandSuperClusters *hiSignalCorrectedIslandBarrelSuperClusters *hiSignalCorrectedIslandEndcapSuperClusters ) diff --git a/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandBarrelSuperClusters_cfi.py b/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandBarrelSuperClusters_cfi.py index c1ee585b8a26a..3edee65e726a6 100644 --- a/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandBarrelSuperClusters_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandBarrelSuperClusters_cfi.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms # Energy scale correction for Island SuperClusters -hiCorrectedIslandBarrelSuperClusters = cms.EDProducer("HiEgammaSCCorrectionMaker", +correctedIslandBarrelSuperClusters = cms.EDProducer("HiEgammaSCCorrectionMaker", corectedSuperClusterCollection = cms.string(''), sigmaElectronicNoise = cms.double(0.03), superClusterAlgo = cms.string('Island'), etThresh = cms.double(0.0), - rawSuperClusterProducer = cms.InputTag("hiIslandSuperClusters","hiIslandBarrelSuperClusters"), + rawSuperClusterProducer = cms.InputTag("islandSuperClusters","islandBarrelSuperClusters"), applyEnergyCorrection = cms.bool(True), isl_fCorrPset = cms.PSet( fEtaVect = cms.vdouble(0.993,0,0.00546,1.165,-0.180844,+0.040312), diff --git a/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandEndcapSuperClusters_cfi.py b/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandEndcapSuperClusters_cfi.py index 7c2675073d31d..5c092143f565b 100644 --- a/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandEndcapSuperClusters_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/HiCorrectedIslandEndcapSuperClusters_cfi.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms # Energy scale correction for Island Endcap SuperClusters -hiCorrectedIslandEndcapSuperClusters = cms.EDProducer("HiEgammaSCCorrectionMaker", +correctedIslandEndcapSuperClusters = cms.EDProducer("HiEgammaSCCorrectionMaker", corectedSuperClusterCollection = cms.string(''), sigmaElectronicNoise = cms.double(0.15), superClusterAlgo = cms.string('Island'), etThresh = cms.double(0.0), - rawSuperClusterProducer = cms.InputTag("hiIslandSuperClusters","hiIslandEndcapSuperClusters"), + rawSuperClusterProducer = cms.InputTag("islandSuperClusters","islandEndcapSuperClusters"), applyEnergyCorrection = cms.bool(True), isl_fCorrPset = cms.PSet( fEtaVect = cms.vdouble(0.993,0,0.00546,1.165,-0.180844,+0.040312), diff --git a/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py b/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py index 75b43dd805f2b..f2018f55a6c97 100644 --- a/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py +++ b/RecoHI/HiEgammaAlgos/python/HiEgamma_cff.py @@ -11,20 +11,15 @@ particleFlowSuperClusterECAL.regressionConfig.vertexCollection = 'hiSelectedVertex' -hiCorrectedEndcapSuperClustersWithPreshower = correctedEndcapSuperClustersWithPreshower.clone( - endcapSClusterProducer = cms.InputTag("hiCorrectedIslandEndcapSuperClusters") -) -hiPreshowerClusteringSequence = cms.Sequence(hiCorrectedEndcapSuperClustersWithPreshower*preshowerClusterShape) - -hiEcalClusteringSequence = cms.Sequence(hiIslandClusteringSequence*hybridClusteringSequence*multi5x5ClusteringSequence*multi5x5PreshowerClusteringSequence*hiPreshowerClusteringSequence*particleFlowSuperClusteringSequence) +hiEcalClusteringSequence = cms.Sequence(islandClusteringSequence*hybridClusteringSequence*multi5x5ClusteringSequence*multi5x5PreshowerClusteringSequence*preshowerClusteringSequence*particleFlowSuperClusteringSequence) # reco photon producer from RecoEgamma.EgammaPhotonProducers.photonSequence_cff import * # use island for the moment -photonCore.scHybridBarrelProducer = cms.InputTag("hiCorrectedIslandBarrelSuperClusters") -photonCore.scIslandEndcapProducer = cms.InputTag("hiCorrectedIslandEndcapSuperClusters") +photonCore.scHybridBarrelProducer = cms.InputTag("correctedIslandBarrelSuperClusters") +photonCore.scIslandEndcapProducer = cms.InputTag("correctedIslandEndcapSuperClusters") photonCore.minSCEt = cms.double(8.0) photons.minSCEtBarrel = cms.double(5.0) photons.minSCEtEndcap = cms.double(15.0) diff --git a/RecoHI/HiEgammaAlgos/python/HiIslandClusteringSequence_cff.py b/RecoHI/HiEgammaAlgos/python/HiIslandClusteringSequence_cff.py index 1b2a603b3fcfa..b5119a50287ea 100644 --- a/RecoHI/HiEgammaAlgos/python/HiIslandClusteringSequence_cff.py +++ b/RecoHI/HiEgammaAlgos/python/HiIslandClusteringSequence_cff.py @@ -13,5 +13,5 @@ from RecoHI.HiEgammaAlgos.HiCorrectedIslandBarrelSuperClusters_cfi import * from RecoHI.HiEgammaAlgos.HiCorrectedIslandEndcapSuperClusters_cfi import * # create sequence for island clustering -hiIslandClusteringSequence = cms.Sequence(islandBasicClusters*hiIslandSuperClusters*hiCorrectedIslandBarrelSuperClusters*hiCorrectedIslandEndcapSuperClusters) +islandClusteringSequence = cms.Sequence(islandBasicClusters*islandSuperClusters*correctedIslandBarrelSuperClusters*correctedIslandEndcapSuperClusters) diff --git a/RecoHI/HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py b/RecoHI/HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py index 7cce51d0617f4..fa0d4ab55471d 100644 --- a/RecoHI/HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/HiIslandSuperClusters_cfi.py @@ -3,8 +3,8 @@ # # # Island SuperCluster producer -hiIslandSuperClusters = cms.EDProducer("HiSuperClusterProducer", - barrelSuperclusterCollection = cms.string('hiIslandBarrelSuperClusters'), +islandSuperClusters = cms.EDProducer("HiSuperClusterProducer", + barrelSuperclusterCollection = cms.string('islandBarrelSuperClusters'), endcapEtaSearchRoad = cms.double(0.14), barrelClusterCollection = cms.string('islandBarrelBasicClusters'), endcapClusterProducer = cms.string('islandBasicClusters'), @@ -14,7 +14,7 @@ seedTransverseEnergyThreshold = cms.double(1.0), barrelBCEnergyThreshold = cms.double(0), endcapBCEnergyThreshold = cms.double(0), - endcapSuperclusterCollection = cms.string('hiIslandEndcapSuperClusters'), + endcapSuperclusterCollection = cms.string('islandEndcapSuperClusters'), barrelEtaSearchRoad = cms.double(0.07), doBarrel = cms.bool(True), doEndcaps = cms.bool(True), diff --git a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py b/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py index ce3e537f50d04..ea63a3717e6f5 100644 --- a/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py +++ b/RecoHI/HiEgammaAlgos/python/RecoHiEgamma_EventContent_cff.py @@ -24,13 +24,13 @@ outputCommands = cms.untracked.vstring( #'keep recoSuperClusters_*_*_*', 'keep recoSuperCluster_cleanedHybridSuperClusters_*_*', - 'keep recoSuperCluster_hiCorrectedEndcapSuperClustersWithPreshower_*_*', + 'keep recoSuperCluster_correctedEndcapSuperClustersWithPreshower_*_*', 'keep recoSuperCluster_correctedHybridSuperClusters_*_*', - 'keep recoSuperCluster_hiCorrectedIslandBarrelSuperClusters_*_*', - 'keep recoSuperCluster_hiCorrectedIslandEndcapSuperClusters_*_*', + 'keep recoSuperCluster_correctedIslandBarrelSuperClusters_*_*', + 'keep recoSuperCluster_correctedIslandEndcapSuperClusters_*_*', 'keep recoSuperCluster_correctedMulti5x5SuperClustersWithPreshower_*_*', 'keep recoSuperCluster_hybridSuperClusters_*_*', - 'keep recoSuperCluster_hiIslandSuperClusters_*_*', + 'keep recoSuperCluster_islandSuperClusters_*_*', 'keep recoSuperCluster_mergedSuperClusters_*_*', 'keep recoSuperCluster_multi5x5SuperClusters_*_*', 'keep recoSuperCluster_multi5x5SuperClustersCleaned_*_*', @@ -93,8 +93,8 @@ outputCommands = cms.untracked.vstring( 'keep floatedmValueMap_*_*_*', 'keep recoGsfElectrons_gedGsfElectronsTmp_*_*', - 'keep recoSuperClusters_hiCorrectedIslandBarrelSuperClusters_*_*', - 'keep recoSuperClusters_hiCorrectedIslandEndcapSuperClusters_*_*', + 'keep recoSuperClusters_correctedIslandBarrelSuperClusters_*_*', + 'keep recoSuperClusters_correctedIslandEndcapSuperClusters_*_*', 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducer_*_*', 'keep recoPhotons_gedPhotonsTmp_*_*', 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerGED_*_*', diff --git a/RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py b/RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py index 6b91cfa0b7ec1..63544044e303b 100644 --- a/RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py +++ b/RecoHI/HiEgammaAlgos/python/hiSpikeCleaner_cfi.py @@ -3,7 +3,7 @@ hiSpikeCleaner = cms.EDProducer("HiSpikeCleaner", recHitProducerBarrel = cms.InputTag("ecalRecHit","EcalRecHitsEB"), recHitProducerEndcap = cms.InputTag("ecalRecHit","EcalRecHitsEE"), - originalSuperClusterProducer = cms.InputTag("hiCorrectedIslandBarrelSuperClusters"), + originalSuperClusterProducer = cms.InputTag("correctedIslandBarrelSuperClusters"), outputColl = cms.string( "" ), etCut = cms.double(10), TimingCut = cms.untracked.double(4.0), diff --git a/Validation/RecoHI/python/globalValidationHeavyIons_cff.py b/Validation/RecoHI/python/globalValidationHeavyIons_cff.py index e88856b95e5c1..4222bbb1c8bd0 100644 --- a/Validation/RecoHI/python/globalValidationHeavyIons_cff.py +++ b/Validation/RecoHI/python/globalValidationHeavyIons_cff.py @@ -14,11 +14,11 @@ egammaBasicClusterAnalyzer.barrelBasicClusterCollection = cms.InputTag("islandBasicClusters","islandBarrelBasicClusters") egammaBasicClusterAnalyzer.endcapBasicClusterCollection = cms.InputTag("islandBasicClusters","islandEndcapBasicClusters") egammaSuperClusterAnalyzer.barrelRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB") -egammaSuperClusterAnalyzer.barrelRawSuperClusterCollection = cms.InputTag("hiIslandSuperClusters","hiIslandBarrelSuperClusters") -egammaSuperClusterAnalyzer.barrelCorSuperClusterCollection = cms.InputTag("hiCorrectedIslandBarrelSuperClusters") +egammaSuperClusterAnalyzer.barrelRawSuperClusterCollection = cms.InputTag("islandSuperClusters","islandBarrelSuperClusters") +egammaSuperClusterAnalyzer.barrelCorSuperClusterCollection = cms.InputTag("correctedIslandBarrelSuperClusters") egammaSuperClusterAnalyzer.endcapRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE") -egammaSuperClusterAnalyzer.endcapRawSuperClusterCollection = cms.InputTag("hiIslandSuperClusters","hiIslandEndcapSuperClusters") -egammaSuperClusterAnalyzer.endcapCorSuperClusterCollection = cms.InputTag("hiCorrectedIslandEndcapSuperClusters") +egammaSuperClusterAnalyzer.endcapRawSuperClusterCollection = cms.InputTag("islandSuperClusters","islandEndcapSuperClusters") +egammaSuperClusterAnalyzer.endcapCorSuperClusterCollection = cms.InputTag("correctedIslandEndcapSuperClusters") #egammaSuperClusterAnalyzer.endcapPreSuperClusterCollection = cms.InputTag("islandEndcapSuperClustersWithPreshower") #to be implemented: only multi5x5 for now From b3b63da42dae185e338e6da681eb4d7d3d906cfd Mon Sep 17 00:00:00 2001 From: Kaya Tatar Date: Fri, 27 Oct 2017 23:48:09 +0200 Subject: [PATCH 10/10] add island clustering to pp_on_XeXe_2017 era by applying the era modifiers to the original definitions in RecoEcal/EgammaClusterProducers as suggested here https://github.com/cms-sw/cmssw/pull/20929#discussion_r145700362 and here https://github.com/cms-sw/cmssw/pull/20929#issuecomment-340003900 --- RecoEcal/Configuration/python/RecoEcal_cff.py | 10 ++-------- .../python/correctedIslandBarrelSuperClusters_cfi.py | 7 +++++++ .../python/correctedIslandEndcapSuperClusters_cfi.py | 7 +++++++ .../python/islandSuperClusters_cfi.py | 7 +++++++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/RecoEcal/Configuration/python/RecoEcal_cff.py b/RecoEcal/Configuration/python/RecoEcal_cff.py index df2c6ed9b3d22..79369134f393f 100644 --- a/RecoEcal/Configuration/python/RecoEcal_cff.py +++ b/RecoEcal/Configuration/python/RecoEcal_cff.py @@ -25,15 +25,9 @@ from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from RecoEcal.EgammaClusterProducers.islandBasicClusters_cfi import islandBasicClusters -from RecoHI.HiEgammaAlgos.HiIslandSuperClusters_cfi import islandSuperClusters -from RecoHI.HiEgammaAlgos.HiCorrectedIslandBarrelSuperClusters_cfi import correctedIslandBarrelSuperClusters -from RecoHI.HiEgammaAlgos.HiCorrectedIslandEndcapSuperClusters_cfi import correctedIslandEndcapSuperClusters +from RecoEcal.EgammaClusterProducers.islandClusteringSequence_cff import * _ecalClustersHI = ecalClusters.copy() -_ecalClustersHI += islandBasicClusters -_ecalClustersHI += islandSuperClusters -_ecalClustersHI += correctedIslandBarrelSuperClusters -_ecalClustersHI += correctedIslandEndcapSuperClusters +_ecalClustersHI += islandClusteringSequence for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: e.toReplaceWith(ecalClusters, _ecalClustersHI) diff --git a/RecoEcal/EgammaClusterProducers/python/correctedIslandBarrelSuperClusters_cfi.py b/RecoEcal/EgammaClusterProducers/python/correctedIslandBarrelSuperClusters_cfi.py index b29b661956630..f117104eacb15 100644 --- a/RecoEcal/EgammaClusterProducers/python/correctedIslandBarrelSuperClusters_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/correctedIslandBarrelSuperClusters_cfi.py @@ -18,4 +18,11 @@ recHitProducer = cms.InputTag("ecalRecHit","EcalRecHitsEB") ) +from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 +from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb +from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 +from RecoHI.HiEgammaAlgos.HiCorrectedIslandBarrelSuperClusters_cfi import correctedIslandBarrelSuperClusters as _hiCorrectedIslandBarrelSuperClusters + +for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: + e.toReplaceWith(correctedIslandBarrelSuperClusters, _hiCorrectedIslandBarrelSuperClusters) diff --git a/RecoEcal/EgammaClusterProducers/python/correctedIslandEndcapSuperClusters_cfi.py b/RecoEcal/EgammaClusterProducers/python/correctedIslandEndcapSuperClusters_cfi.py index ad8f2f14bf599..bd7d53987b00e 100644 --- a/RecoEcal/EgammaClusterProducers/python/correctedIslandEndcapSuperClusters_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/correctedIslandEndcapSuperClusters_cfi.py @@ -18,4 +18,11 @@ recHitProducer = cms.InputTag("ecalRecHit","EcalRecHitsEE") ) +from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 +from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb +from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 +from RecoHI.HiEgammaAlgos.HiCorrectedIslandEndcapSuperClusters_cfi import correctedIslandEndcapSuperClusters as _hiCorrectedIslandEndcapSuperClusters + +for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: + e.toReplaceWith(correctedIslandEndcapSuperClusters, _hiCorrectedIslandEndcapSuperClusters) diff --git a/RecoEcal/EgammaClusterProducers/python/islandSuperClusters_cfi.py b/RecoEcal/EgammaClusterProducers/python/islandSuperClusters_cfi.py index 102920793f790..46978e12b304d 100644 --- a/RecoEcal/EgammaClusterProducers/python/islandSuperClusters_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/islandSuperClusters_cfi.py @@ -27,4 +27,11 @@ ) ) +from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 +from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb +from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 +from RecoHI.HiEgammaAlgos.HiIslandSuperClusters_cfi import islandSuperClusters as _hiIslandSuperClusters + +for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]: + e.toReplaceWith(islandSuperClusters, _hiIslandSuperClusters)