fix the pp_on_XeXe_2017 era to run and store island photons

apply the era modifiers to the original definitions in RecoEcal/EgammaClusterProducers
as suggested here cms-sw#20929 (comment)
and here cms-sw#20929 (comment)

RecoEcal/Configuration/python/RecoEcal_cff.py

@@ -25,9 +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 RecoEcal.EgammaClusterProducers.islandClusteringSequence_cff import *
 
 _ecalClustersHI = ecalClusters.copy()
-_ecalClustersHI += islandBasicClusters
+_ecalClustersHI += islandClusteringSequence
 for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]:
     e.toReplaceWith(ecalClusters, _ecalClustersHI)

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)

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)

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)

RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py

@@ -178,6 +178,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_*_*'
                                                                            ])
                     )

RecoEgamma/Configuration/python/RecoEgamma_cff.py

@@ -44,13 +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 += islandBasicClusters
 _egammaHighLevelRecoPostPF_HI += photonIsolationHIProducerpp
 _egammaHighLevelRecoPostPF_HI += photonIsolationHIProducerppGED
+_egammaHighLevelRecoPostPF_HI += photonIsolationHIProducerppIsland
 for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017]:
     e.toReplaceWith(egammaHighLevelRecoPostPF, _egammaHighLevelRecoPostPF_HI)

RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py

@@ -16,7 +16,7 @@
 #    MVA_weights_location = cms.string('RecoEgamma/EgammaTools/data/TMVAnalysis_Likelihood.weights.txt')
 )
 
-photonCoreIsland = photonCore.clone(
+islandPhotonCore = photonCore.clone(
     scHybridBarrelProducer = "correctedIslandBarrelSuperClusters",
     scIslandEndcapProducer = "correctedIslandEndcapSuperClusters",
     minSCEt = 8.0

RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py

@@ -10,9 +10,10 @@
 photonSequence = cms.Sequence( photonCore + photons )
 
 _photonSequenceWithIsland = photonSequence.copy()
-_photonSequenceWithIsland += ( photonCoreIsland + photonsIsland)
+_photonSequenceWithIsland += ( islandPhotonCore + islandPhotons )
 
+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)

RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py

@@ -76,7 +76,7 @@
 )
 
 
-photonsIsland = photons.clone(
+islandPhotons = photons.clone(
     photonCoreProducer = "islandPhotonCore",
     minSCEtBarrel = 5.0,
     minSCEtEndcap = 15.0,

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)