First commit.

SohamBhattacharya · SohamBhattacharya · commit d98bec84ea7c · 2021-07-08T13:31:32.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ __init__.py
 #*#
 *~
 *.pb
+*.root
+*replace.py
diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
@@ -186,7 +186,7 @@
 cms.untracked.PSet(branch = cms.untracked.string("EcalRecHitsSorted_reducedEgamma_reducedESRecHits_*"),splitLevel=cms.untracked.int32(99)),
 ])
 
-_phase2_hgc_extraCommands = ["keep *_slimmedElectronsFromMultiCl_*_*", "keep *_slimmedPhotonsFromMultiCl_*_*"]
+_phase2_hgc_extraCommands = ["keep *_slimmedElectronsHGC_*_*", "keep *_slimmedPhotonsHGC_*_*"]
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toModify(MicroEventContentMC, outputCommands = MicroEventContentMC.outputCommands + _phase2_hgc_extraCommands)
 
diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
@@ -534,8 +534,8 @@ def _add_deepMET(process):
     # EGamma objects from HGCal are not yet in GED
     # so add companion collections for Phase-II MiniAOD production
     from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
-    process.load("RecoEgamma.EgammaTools.slimmedEgammaFromMultiCl_cff")
-    phase2_hgcal.toModify(task, func=lambda t: t.add(process.slimmedEgammaFromMultiClTask))
+    process.load("RecoEgamma.EgammaTools.slimmedEgammaHGC_cff")
+    phase2_hgcal.toModify(task, func=lambda t: t.add(process.slimmedEgammaHGCTask))
 
     # L1 pre-firing weights for 2016, 2017, and 2018
     from Configuration.Eras.Modifier_run2_L1prefiring_cff import run2_L1prefiring
diff --git a/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py b/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py
@@ -27,8 +27,8 @@
 )
 _phase2_hgcal_scCommandsAOD = ['keep recoSuperClusters_particleFlowSuperClusterHGCal__*',
                                'keep recoCaloClusters_particleFlowSuperClusterHGCal__*',
-                               'keep recoSuperClusters_particleFlowSuperClusterHGCalFromMultiCl__*',
-                               'keep recoCaloClusters_particleFlowSuperClusterHGCalFromMultiCl__*']
+                               'keep recoSuperClusters_particleFlowSuperClusterHGCal__*',
+                               'keep recoCaloClusters_particleFlowSuperClusterHGCal__*']
 
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toModify(RecoEcalAOD,
@@ -66,7 +66,7 @@
 )
 RecoEcalRECO.outputCommands.extend(RecoEcalAOD.outputCommands)
 _phase2_hgcal_scCommands = ['keep *_particleFlowSuperClusterHGCal_*_*',
-                            'keep *_particleFlowSuperClusterHGCalFromMultiCl_*_*']
+                            'keep *_particleFlowSuperClusterHGCal_*_*']
 phase2_hgcal.toModify(RecoEcalRECO,
     outputCommands = RecoEcalRECO.outputCommands + _phase2_hgcal_scCommands)
 
diff --git a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py
@@ -25,13 +25,13 @@
     dropUnseedable                 = True,
 )
 
-particleFlowSuperClusterHGCalFromMultiCl = particleFlowSuperClusterHGCal.clone()
+particleFlowSuperClusterHGCal = particleFlowSuperClusterHGCal.clone()
 phase2_hgcal.toModify(
-    particleFlowSuperClusterHGCalFromMultiCl,
-    PFClusters = 'particleFlowClusterHGCalFromMultiCl',
+    particleFlowSuperClusterHGCal,
+    PFClusters = 'particleFlowClusterHGCal',
     useRegression  = True,
 )
-phase2_hgcal.toModify( particleFlowSuperClusterHGCalFromMultiCl.regressionConfig,
+phase2_hgcal.toModify( particleFlowSuperClusterHGCal.regressionConfig,
     regressionKeyEE = "superclus_hgcal_mean_offline",
     uncertaintyKeyEE = "superclus_hgcal_sigma_offline",
     isPhaseII = True,
@@ -40,7 +40,7 @@
 )
 _phase2_hgcal_particleFlowSuperClusteringTask = particleFlowSuperClusteringTask.copy()
 _phase2_hgcal_particleFlowSuperClusteringTask.add(particleFlowSuperClusterHGCal)
-_phase2_hgcal_particleFlowSuperClusteringTask.add(particleFlowSuperClusterHGCalFromMultiCl)
+_phase2_hgcal_particleFlowSuperClusteringTask.add(particleFlowSuperClusterHGCal)
 
 phase2_hgcal.toReplaceWith( particleFlowSuperClusteringTask, _phase2_hgcal_particleFlowSuperClusteringTask )
 
diff --git a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py
@@ -52,10 +52,10 @@
 # mods for HGCAL
 _phase2_hgcal_RecoEgamma_tokeep = [ 'keep *_ecalDrivenGsfElectronCores_*_*',
                                     'keep *_ecalDrivenGsfElectrons_*_*',
-                                    'keep *_ecalDrivenGsfElectronCoresFromMultiCl_*_*',
-                                    'keep *_ecalDrivenGsfElectronsFromMultiCl_*_*',
-                                    'keep *_photonCoreFromMultiCl_*_*',
-                                    'keep *_photonsFromMultiCl_*_*']
+                                    'keep *_ecalDrivenGsfElectronCoresHGC_*_*',
+                                    'keep *_ecalDrivenGsfElectronsHGC_*_*',
+                                    'keep *_photonCoreHGC_*_*',
+                                    'keep *_photonsHGC_*_*']
 
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toModify( RecoEgammaAOD,  
diff --git a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cff.py b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cff.py
@@ -25,6 +25,3 @@
                            LowPtThreshold =1.0,
                            applyHOverECut = False) 
 
-# create ecal driven seeds for electron using HGCal Multiclusters
-ecalDrivenElectronSeedsFromMultiCl = ecalDrivenElectronSeeds.clone(
-  endcapSuperClusters = 'particleFlowSuperClusterHGCalFromMultiCl')
diff --git a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenGsfElectronCoresHGC_cff.py b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenGsfElectronCoresHGC_cff.py
@@ -1,6 +1,6 @@
 from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCores_cfi import ecalDrivenGsfElectronCores
 
-ecalDrivenGsfElectronCoresFromMultiCl = ecalDrivenGsfElectronCores.clone(
-  gsfTracks = 'electronGsfTracksFromMultiCl',
+ecalDrivenGsfElectronCoresHGC = ecalDrivenGsfElectronCores.clone(
+  gsfTracks = 'electronGsfTracks',
   useGsfPfRecTracks = False
 )
diff --git a/RecoEgamma/EgammaElectronProducers/python/gsfElectronSequence_cff.py b/RecoEgamma/EgammaElectronProducers/python/gsfElectronSequence_cff.py
@@ -7,16 +7,16 @@
 #==============================================================================
 
 from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCores_cfi import ecalDrivenGsfElectronCores
-from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresFromMultiCl_cff import ecalDrivenGsfElectronCoresFromMultiCl
+from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresHGC_cff import ecalDrivenGsfElectronCoresHGC
 from RecoEgamma.EgammaElectronProducers.gsfElectrons_cfi import *
 
 gsfEcalDrivenElectronTask = cms.Task(ecalDrivenGsfElectronCores,ecalDrivenGsfElectrons)
 gsfEcalDrivenElectronSequence = cms.Sequence(gsfEcalDrivenElectronTask)
 
-_gsfEcalDrivenElectronTaskFromMultiCl = gsfEcalDrivenElectronTask.copy()
-_gsfEcalDrivenElectronTaskFromMultiCl.add(cms.Task(ecalDrivenGsfElectronCoresFromMultiCl,ecalDrivenGsfElectronsFromMultiCl))
+_gsfEcalDrivenElectronTaskHGC = gsfEcalDrivenElectronTask.copy()
+_gsfEcalDrivenElectronTaskHGC.add(cms.Task(ecalDrivenGsfElectronCoresHGC,ecalDrivenGsfElectronsHGC))
 
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toReplaceWith(
-  gsfEcalDrivenElectronTask, _gsfEcalDrivenElectronTaskFromMultiCl
+  gsfEcalDrivenElectronTask, _gsfEcalDrivenElectronTaskHGC
 )
diff --git a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py
@@ -28,8 +28,8 @@
 pp_on_AA.toModify(ecalDrivenGsfElectrons.preselection, minSCEtBarrel = 15.0)
 pp_on_AA.toModify(ecalDrivenGsfElectrons.preselection, minSCEtEndcaps = 15.0)
 
-ecalDrivenGsfElectronsFromMultiCl = ecalDrivenGsfElectrons.clone(
-    gsfElectronCoresTag = "ecalDrivenGsfElectronCoresFromMultiCl",
+ecalDrivenGsfElectronsHGC = ecalDrivenGsfElectrons.clone(
+    gsfElectronCoresTag = "ecalDrivenGsfElectronCoresHGC",
     useGsfPfRecTracks = False,
     useDefaultEnergyCorrection = False,
     ambClustersOverlapStrategy = 0,
diff --git a/RecoEgamma/EgammaElectronProducers/python/uncleanedOnlyElectronSequence_cff.py b/RecoEgamma/EgammaElectronProducers/python/uncleanedOnlyElectronSequence_cff.py
@@ -135,7 +135,7 @@
 #
 
 from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCores_cfi import ecalDrivenGsfElectronCores
-from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresFromMultiCl_cff import ecalDrivenGsfElectronCoresFromMultiCl
+from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresHGC_cff import ecalDrivenGsfElectronCoresHGC
 uncleanedOnlyGsfElectronCores = ecalDrivenGsfElectronCores.clone(
     gsfTracks      = "uncleanedOnlyElectronGsfTracks",
     gsfPfRecTracks = "uncleanedOnlyPfTrackElec"
diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photonCore_cfi.py
@@ -16,9 +16,9 @@
 #    MVA_weights_location = cms.string('RecoEgamma/EgammaTools/data/TMVAnalysis_Likelihood.weights.txt')
 )
 
-photonCoreFromMultiCl = photonCore.clone(
-    scIslandEndcapProducer = 'particleFlowSuperClusterHGCalFromMultiCl',
-    pixelSeedProducer = 'electronMergedSeedsFromMultiCl'
+photonCoreHGC = photonCore.clone(
+    scIslandEndcapProducer = 'particleFlowSuperClusterHGCal',
+    pixelSeedProducer = 'electronMergedSeeds'
 )
 
 islandPhotonCore = photonCore.clone(
diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py
@@ -10,15 +10,15 @@
 photonTask = cms.Task(photonCore,photons)
 photonSequence = cms.Sequence(photonTask)
 
-_photonTaskFromMultiCl = photonTask.copy()
-_photonTaskFromMultiCl.add(photonCoreFromMultiCl,photonsFromMultiCl)
+_photonTaskHGC = photonTask.copy()
+_photonTaskHGC.add(photonCoreHGC,photonsHGC)
 _photonTaskWithIsland = photonTask.copy()
 _photonTaskWithIsland.add(islandPhotonCore,islandPhotons)
 
 
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toReplaceWith(
- photonTask, _photonTaskFromMultiCl
+ photonTask, _photonTaskHGC
 )
 
 from Configuration.Eras.Modifier_pA_2016_cff import pA_2016
diff --git a/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/photons_cfi.py
@@ -83,8 +83,8 @@
     checkHcalStatus = cms.bool(True),
 )
 
-photonsFromMultiCl = photons.clone(
-  photonProducer = 'photonCoreFromMultiCl'
+photonsHGC = photons.clone(
+  photonProducer = 'photonCoreHGC'
 )
 
 islandPhotons = cms.EDProducer("PhotonProducer",
diff --git a/RecoEgamma/EgammaTools/plugins/HGCalElectronFilter.cc b/RecoEgamma/EgammaTools/plugins/HGCalElectronFilter.cc
@@ -113,12 +113,12 @@ void HGCalElectronFilter::endStream() {}
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
 void HGCalElectronFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  // cleanedEcalDrivenGsfElectronsFromMultiCl
+  // cleanedEcalDrivenGsfElectronsHGC
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("inputGsfElectrons", edm::InputTag("ecalDrivenGsfElectronsFromMultiCl"));
+  desc.add<edm::InputTag>("inputGsfElectrons", edm::InputTag("ecalDrivenGsfElectronsHGC"));
   desc.add<bool>("cleanBarrel", false);
   desc.add<std::string>("outputCollection", "");
-  descriptions.add("cleanedEcalDrivenGsfElectronsFromMultiCl", desc);
+  descriptions.add("cleanedEcalDrivenGsfElectronsHGC", desc);
 }
 
 //define this as a plug-in
diff --git a/RecoEgamma/EgammaTools/plugins/HGCalElectronIDValueMapProducer.cc b/RecoEgamma/EgammaTools/plugins/HGCalElectronIDValueMapProducer.cc
@@ -220,7 +220,7 @@ void HGCalElectronIDValueMapProducer::endStream() {}
 void HGCalElectronIDValueMapProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   // Auto-generate hgcalElectronIDValueMap_cfi
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("electrons", edm::InputTag("ecalDrivenGsfElectronsFromMultiCl"));
+  desc.add<edm::InputTag>("electrons", edm::InputTag("ecalDrivenGsfElectronsHGC"));
   desc.add<double>("pcaRadius", 3.0);
   desc.add<std::vector<std::string>>("variables", valuesProduced_);
   desc.add<std::vector<double>>("dEdXWeights")
diff --git a/RecoEgamma/EgammaTools/plugins/HGCalPhotonIDValueMapProducer.cc b/RecoEgamma/EgammaTools/plugins/HGCalPhotonIDValueMapProducer.cc
@@ -204,7 +204,7 @@ void HGCalPhotonIDValueMapProducer::endStream() {}
 void HGCalPhotonIDValueMapProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   // hgcalPhotonIDValueMap
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("photons", edm::InputTag("photonsFromMultiCl"));
+  desc.add<edm::InputTag>("photons", edm::InputTag("photonsHGC"));
   desc.add<double>("pcaRadius", 3.0);
   desc.add<std::vector<std::string>>("variables", valuesProduced_);
   desc.add<std::vector<double>>("dEdXWeights")
diff --git a/RecoEgamma/EgammaTools/python/slimmedEgammaHGC_cff.py b/RecoEgamma/EgammaTools/python/slimmedEgammaHGC_cff.py
@@ -1,16 +1,16 @@
 import FWCore.ParameterSet.Config as cms
 
-from RecoEgamma.EgammaTools.cleanedEcalDrivenGsfElectronsFromMultiCl_cfi import cleanedEcalDrivenGsfElectronsFromMultiCl
+from RecoEgamma.EgammaTools.cleanedEcalDrivenGsfElectronsHGC_cfi import cleanedEcalDrivenGsfElectronsHGC
 from RecoEgamma.EgammaTools.hgcalElectronIDValueMap_cff import hgcalElectronIDValueMap
 from PhysicsTools.PatAlgos.PATElectronProducer_cfi import PATElectronProducer
 from PhysicsTools.PatAlgos.slimming.slimmedElectrons_cfi import slimmedElectrons
 from RecoLocalCalo.HGCalRecProducers.hgcalRecHitMapProducer_cfi import hgcalRecHitMapProducer
 
 hgcElectronID = hgcalElectronIDValueMap.clone(
-    electrons = "cleanedEcalDrivenGsfElectronsFromMultiCl",
+    electrons = "cleanedEcalDrivenGsfElectronsHGC",
 )
-patElectronsFromMultiCl = PATElectronProducer.clone(
-    electronSource             = "cleanedEcalDrivenGsfElectronsFromMultiCl",
+patElectronsHGC = PATElectronProducer.clone(
+    electronSource             = "cleanedEcalDrivenGsfElectronsHGC",
     beamLineSrc                = "offlineBeamSpot",
     pvSrc                      = "offlinePrimaryVertices",
     addElectronID              = False,
@@ -41,23 +41,23 @@
         userFunctionLabels = cms.vstring()
     ),
 )
-selectedPatElectronsFromMultiCl = cms.EDFilter("PATElectronSelector",
-    src = cms.InputTag("patElectronsFromMultiCl"),
+selectedPatElectronsHGC = cms.EDFilter("PATElectronSelector",
+    src = cms.InputTag("patElectronsHGC"),
     cut = cms.string("!isEB && pt >= 10."),
 )
-slimmedElectronsFromMultiCl = slimmedElectrons.clone(
-    src = "selectedPatElectronsFromMultiCl",
+slimmedElectronsHGC = slimmedElectrons.clone(
+    src = "selectedPatElectronsHGC",
     linkToPackedPFCandidates = False,
     saveNonZSClusterShapes   = "0",
     modifyElectrons          = False,
 )
 
-slimmedElectronsFromMultiClTask = cms.Task(
-    cleanedEcalDrivenGsfElectronsFromMultiCl,
+slimmedElectronsHGCTask = cms.Task(
+    cleanedEcalDrivenGsfElectronsHGC,
     hgcElectronID,
-    patElectronsFromMultiCl,
-    selectedPatElectronsFromMultiCl,
-    slimmedElectronsFromMultiCl
+    patElectronsHGC,
+    selectedPatElectronsHGC,
+    slimmedElectronsHGC
 )
 
 
@@ -67,9 +67,9 @@
 
 hgcPhotonID = hgcalPhotonIDValueMap.clone()
 
-patPhotonsFromMultiCl = PATPhotonProducer.clone(
-    photonSource           = "photonsFromMultiCl",
-    electronSource         = "ecalDrivenGsfElectronsFromMultiCl",
+patPhotonsHGC = PATPhotonProducer.clone(
+    photonSource           = "photonsHGC",
+    electronSource         = "ecalDrivenGsfElectronsHGC",
     beamLineSrc            = "offlineBeamSpot",
     addPhotonID            = False,
     addGenMatch            = False,
@@ -92,26 +92,26 @@
         userFunctionLabels = cms.vstring()
     ),
 )
-selectedPatPhotonsFromMultiCl = cms.EDFilter("PATPhotonSelector",
-    src = cms.InputTag("patPhotonsFromMultiCl"),
+selectedPatPhotonsHGC = cms.EDFilter("PATPhotonSelector",
+    src = cms.InputTag("patPhotonsHGC"),
     cut = cms.string("!isEB && pt >= 15."),
 )
-slimmedPhotonsFromMultiCl = slimmedPhotons.clone(
-    src = "selectedPatPhotonsFromMultiCl",
+slimmedPhotonsHGC = slimmedPhotons.clone(
+    src = "selectedPatPhotonsHGC",
     linkToPackedPFCandidates = False,
     saveNonZSClusterShapes   = "0",
     modifyPhotons            = False,
 )
 
-slimmedPhotonsFromMultiClTask = cms.Task(
+slimmedPhotonsHGCTask = cms.Task(
     hgcPhotonID,
-    patPhotonsFromMultiCl,
-    selectedPatPhotonsFromMultiCl,
-    slimmedPhotonsFromMultiCl
+    patPhotonsHGC,
+    selectedPatPhotonsHGC,
+    slimmedPhotonsHGC
 )
 
-slimmedEgammaFromMultiClTask = cms.Task(
+slimmedEgammaHGCTask = cms.Task(
     hgcalRecHitMapProducer,
-    slimmedElectronsFromMultiClTask,
-    slimmedPhotonsFromMultiClTask
+    slimmedElectronsHGCTask,
+    slimmedPhotonsHGCTask
 )
diff --git a/RecoLocalCalo/Configuration/python/hgcalLocalReco_cff.py b/RecoLocalCalo/Configuration/python/hgcalLocalReco_cff.py
@@ -19,7 +19,7 @@
                                        hgcalMultiClusters,
                                        particleFlowRecHitHGC,
                                        particleFlowClusterHGCal,
-                                       particleFlowClusterHGCalFromMultiCl )
+                                       particleFlowClusterHGCal )
 
 _hfnose_hgcalLocalRecoTask = hgcalLocalRecoTask.copy()
 _hfnose_hgcalLocalRecoTask.add(hgcalLayerClustersHFNose)
diff --git a/RecoParticleFlow/Configuration/python/RecoParticleFlow_EventContent_cff.py b/RecoParticleFlow/Configuration/python/RecoParticleFlow_EventContent_cff.py
@@ -67,7 +67,7 @@
 RecoParticleFlowRECO.outputCommands.extend(RecoParticleFlowAOD.outputCommands)
 
 phase2_hgcal.toModify( RecoParticleFlowRECO,
-    outputCommands = RecoParticleFlowRECO.outputCommands + ['keep *_particleFlowSuperClusterHGCalFromMultiCl_*_*',
+    outputCommands = RecoParticleFlowRECO.outputCommands + ['keep *_particleFlowSuperClusterHGCal_*_*',
                                                             'keep recoPFBlocks_simPFProducer_*_*'])
 
 # Full Event content
diff --git a/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py b/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py
@@ -72,6 +72,7 @@
                                     hgcalTrackCollection ,
                                     tpClusterProducer ,
                                     quickTrackAssociatorByHits ,
+                                    particleFlowClusterHGCalFromSimCl ,
                                     simPFProducer )
 _phase2_hgcal_simPFSequence = cms.Sequence(_phase2_hgcal_simPFTask)
 
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHGC_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHGC_cfi.py
@@ -61,12 +61,12 @@
     recHitCleaners = cms.VPSet(),
     seedCleaners   = cms.VPSet(),
     seedFinder = _passThruSeeds_HGCal,
-    initialClusteringStep = _simClusterMapper_HGCal,
+    initialClusteringStep = _hgcalTracksterMapper_HGCal,
     pfClusterBuilder = cms.PSet(),
     positionReCalc = _positionCalcPCA_HGCal,
     energyCorrector = cms.PSet()
     )
 
-particleFlowClusterHGCalFromMultiCl = particleFlowClusterHGCal.clone(
-    initialClusteringStep = _hgcalTracksterMapper_HGCal
+particleFlowClusterHGCalFromSimCl = particleFlowClusterHGCal.clone(
+    initialClusteringStep = _simClusterMapper_HGCal
 )
diff --git a/RecoParticleFlow/PFSimProducer/plugins/SimPFProducer.cc b/RecoParticleFlow/PFSimProducer/plugins/SimPFProducer.cc
@@ -78,7 +78,7 @@ DEFINE_FWK_MODULE(SimPFProducer);
 void SimPFProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   // simPFProducer
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("simClustersSrc", {"particleFlowClusterHGCal"});
+  desc.add<edm::InputTag>("simClustersSrc", {"particleFlowClusterHGCalFromSimCl"});
   desc.add<edm::InputTag>("trackSrc", {"generalTracks"});
   desc.add<std::vector<edm::InputTag>>("associators",
                                        {
diff --git a/RecoParticleFlow/PFTracking/python/mergedElectronSeeds_cfi.py b/RecoParticleFlow/PFTracking/python/mergedElectronSeeds_cfi.py
@@ -9,6 +9,3 @@
 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 pp_on_AA.toModify(electronMergedSeeds, TkBasedSeeds = '')
 
-electronMergedSeedsFromMultiCl = electronMergedSeeds.clone(
-  EcalBasedSeeds = 'ecalDrivenElectronSeedsFromMultiCl'
-)
diff --git a/TrackingTools/Configuration/python/TrackingTools_EventContent_cff.py b/TrackingTools/Configuration/python/TrackingTools_EventContent_cff.py
diff --git a/TrackingTools/GsfTracking/python/CkfElectronCandidateMaker_cff.py b/TrackingTools/GsfTracking/python/CkfElectronCandidateMaker_cff.py
diff --git a/TrackingTools/GsfTracking/python/GsfElectronGsfFit_cff.py b/TrackingTools/GsfTracking/python/GsfElectronGsfFit_cff.py
diff --git a/TrackingTools/GsfTracking/python/GsfElectronTracking_cff.py b/TrackingTools/GsfTracking/python/GsfElectronTracking_cff.py
diff --git a/Validation/HGCalValidation/plugins/HGCalHitCalibration.cc b/Validation/HGCalValidation/plugins/HGCalHitCalibration.cc
diff --git a/Validation/RecoEgamma/python/ElectronMcFakeValidator_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcFakeValidator_gedGsfElectrons_cfi.py
diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidatorMiniAOD_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidatorMiniAOD_cfi.py
diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi.py
diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidator_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidator_gedGsfElectrons_cfi.py

-Original file line number
+Diff line change
 #*#
 *~
 *.pb
 +*.root
 +*replace.py
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCores_cfi import ecalDrivenGsfElectronCores`
`2`	`2`
`3`		`-ecalDrivenGsfElectronCoresFromMultiCl = ecalDrivenGsfElectronCores.clone(`
`4`		`- gsfTracks = 'electronGsfTracksFromMultiCl',`
	`3`	`+ecalDrivenGsfElectronCoresHGC = ecalDrivenGsfElectronCores.clone(`
	`4`	`+ gsfTracks = 'electronGsfTracks',`
`5`	`5`	`useGsfPfRecTracks = False`
`6`	`6`	`)`