Merge pull request #37756 from swagata87/remove_PSvar

Remove unused variable use_preshower from PFECALSuperClusterProducer
cms-sw · May 5, 2022 · 21d065f · 21d065f
2 parents 4c58db9 + ece096d
commit 21d065f
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 13 deletions.
diff --git a/...ger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALL1Seeded_cfi.py b/...ger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALL1Seeded_cfi.py
@@ -42,6 +42,5 @@
     thresh_SCEt = cms.double(10.0),
     useDynamicDPhiWindow = cms.bool(True),
     useRegression = cms.bool(True),
-    use_preshower = cms.bool(True),
     verbose = cms.untracked.bool(False)
 )
diff --git a/...ger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALUnseeded_cfi.py b/...ger/Configuration/python/HLT_75e33/modules/hltParticleFlowSuperClusterECALUnseeded_cfi.py
@@ -42,6 +42,5 @@
     thresh_SCEt = cms.double(10.0),
     useDynamicDPhiWindow = cms.bool(True),
     useRegression = cms.bool(True),
-    use_preshower = cms.bool(True),
     verbose = cms.untracked.bool(False)
 )
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterECAL_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterECAL_cfi.py
@@ -57,6 +57,5 @@
     thresh_SCEt = cms.double(4),
     useDynamicDPhiWindow = cms.bool(True),
     useRegression = cms.bool(True),
-    use_preshower = cms.bool(True),
     verbose = cms.untracked.bool(False)
 )
diff --git a/...nfiguration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLL1Seeded_cfi.py b/...nfiguration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLL1Seeded_cfi.py
@@ -48,6 +48,5 @@
     thresh_SCEt = cms.double(10.0),
     useDynamicDPhiWindow = cms.bool(True),
     useRegression = cms.bool(True),
-    use_preshower = cms.bool(False),
     verbose = cms.untracked.bool(False)
 )
diff --git a/...nfiguration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLUnseeded_cfi.py b/...nfiguration/python/HLT_75e33/modules/particleFlowSuperClusterHGCalFromTICLUnseeded_cfi.py
@@ -48,6 +48,5 @@
     thresh_SCEt = cms.double(10.0),
     useDynamicDPhiWindow = cms.bool(True),
     useRegression = cms.bool(True),
-    use_preshower = cms.bool(False),
     verbose = cms.untracked.bool(False)
 )
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCal_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/particleFlowSuperClusterHGCal_cfi.py
@@ -57,6 +57,5 @@
     thresh_SCEt = cms.double(4),
     useDynamicDPhiWindow = cms.bool(True),
     useRegression = cms.bool(False),
-    use_preshower = cms.bool(False),
     verbose = cms.untracked.bool(False)
 )
diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -172,6 +172,15 @@ def customiseFor37231(process):
 
     return process
 
+def customiseFor37756(process):
+    """https://github.com/cms-sw/cmssw/pull/37756
+    Removal of use_preshower parameter from PFECALSuperClusterProducer
+    """
+    for prod in producers_by_type(process, 'PFECALSuperClusterProducer'):
+        if hasattr(prod, 'use_preshower'):
+            delattr(prod, 'use_preshower')
+
+    return process
 
 def customiseFor37646(process):
     """ Customisation to remove a renamed parameter in HLTScoutingPFProducer
@@ -204,7 +213,7 @@ def customizeHLTforCMSSW(process, menuType="GRun"):
     # process = customiseFor12718(process)
 
     process = customiseFor37231(process)
-
     process = customiseFor37646(process)
-
+    process = customiseFor37756(process)
+
     return process
diff --git a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECALBox_cfi.py b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECALBox_cfi.py
@@ -24,9 +24,6 @@
     PFBasicClusterCollectionPreshower = "particleFlowBasicClusterECALPreshower",
     PFSuperClusterCollectionEndcapWithPreshower = "particleFlowSuperClusterECALEndcapWithPreshower",
 
-    # use preshower ?
-    use_preshower = True,
-
     # are the seed thresholds Et or Energy?
     seedThresholdIsET = True,
 

diff --git a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py
@@ -17,7 +17,6 @@
     particleFlowSuperClusterHGCal,
     PFClusters                     = 'particleFlowClusterHGCal',
     useRegression                  = True,
-    use_preshower                  = False,
     PFBasicClusterCollectionEndcap = "",
     PFSuperClusterCollectionEndcap = "",
     PFSuperClusterCollectionEndcapWithPreshower = "",

diff --git a/RecoEcal/EgammaClusterProducers/src/PFECALSuperClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/PFECALSuperClusterProducer.cc
@@ -341,7 +341,6 @@ void PFECALSuperClusterProducer::fillDescriptions(edm::ConfigurationDescriptions
   desc.add<double>("thresh_PFClusterEndcap", 0.0);
   desc.add<edm::InputTag>("ESAssociation", edm::InputTag("particleFlowClusterECAL"));
   desc.add<std::string>("PFBasicClusterCollectionPreshower", "particleFlowBasicClusterECALPreshower");
-  desc.add<bool>("use_preshower", true);
   desc.addUntracked<bool>("verbose", false);
   desc.add<double>("thresh_SCEt", 4.0);
   desc.add<double>("etawidth_SuperClusterEndcap", 0.04);