Merge pull request #29658 from missirol/devel_correctedECALPFClusterP…

…roducerFillDesc2 small cleanup of CorrectedECALPFClusterProducer::fillDescriptions
cms-sw · May 8, 2020 · cec94b8 · cec94b8
2 parents 131e0c0 + e2ff927
commit cec94b8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -183,11 +183,25 @@ def customiseFor29512(process):
 
     return process
 
+def customiseFor29658(process):
+    """small cleanup of CorrectedECALPFClusterProducer::fillDescriptions
+    Removes two unused parameters of CorrectedECALPFClusterProducer
+    PR: https://github.com/cms-sw/cmssw/pull/29658
+    """
+    for mod in producers_by_type(process, 'CorrectedECALPFClusterProducer'):
+        if hasattr(mod, 'energyCorrector'):
+           for parName in ['algoName', 'verticesLabel']:
+               if hasattr(mod.energyCorrector, parName):
+                  delattr(mod.energyCorrector, parName)
+
+    return process
+
 # CMSSW version specific customizations
 def customizeHLTforCMSSW(process, menuType="GRun"):
 
     # add call to action function in proper order: newest last!
     # process = customiseFor12718(process)
     process = customiseFor29512(process)
+    process = customiseFor29658(process)
 
     return process
diff --git a/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py b/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py
@@ -37,8 +37,6 @@
 
 from RecoParticleFlow.Configuration.RecoParticleFlow_cff import *
 
-particleFlowClusterECAL.energyCorrector.verticesLabel = cms.InputTag('hiPixelAdaptiveVertex')
-
 mvaElectrons.vertexTag = cms.InputTag("hiSelectedVertex")
 
 particleFlowBlock.elementImporters = cms.VPSet(

diff --git a/RecoParticleFlow/PFClusterProducer/plugins/CorrectedECALPFClusterProducer.cc b/RecoParticleFlow/PFClusterProducer/plugins/CorrectedECALPFClusterProducer.cc
@@ -135,10 +135,8 @@ void CorrectedECALPFClusterProducer::fillDescriptions(edm::ConfigurationDescript
     psd0.add<bool>("autoDetectBunchSpacing", true);
     psd0.add<int>("bunchSpacing", 25);
     psd0.add<double>("maxPtForMVAEvaluation", -99.);
-    psd0.add<std::string>("algoName", "PFClusterEMEnergyCorrector");
     psd0.add<edm::InputTag>("recHitsEBLabel", edm::InputTag("ecalRecHit", "EcalRecHitsEB"));
     psd0.add<edm::InputTag>("recHitsEELabel", edm::InputTag("ecalRecHit", "EcalRecHitsEE"));
-    psd0.add<edm::InputTag>("verticesLabel", edm::InputTag("offlinePrimaryVertices"));
     psd0.add<edm::InputTag>("ebSrFlagLabel", edm::InputTag("ecalDigis"));
     psd0.add<edm::InputTag>("eeSrFlagLabel", edm::InputTag("ecalDigis"));
     desc.add<edm::ParameterSetDescription>("energyCorrector", psd0);