Cleanup redundant edm ParameterSet exist in RecoLuminosity

cms-sw · Jun 3, 2022 · 1da1a78 · 1da1a78
1 parent 9c0c506
commit 1da1a78
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/RecoLuminosity/LumiProducer/plugins/BunchSpacingProducer.cc b/RecoLuminosity/LumiProducer/plugins/BunchSpacingProducer.cc
@@ -39,13 +39,8 @@ BunchSpacingProducer::BunchSpacingProducer::BunchSpacingProducer(const edm::Para
   // register your products
   produces<unsigned int>();
   bunchSpacing_ = consumes<int>(edm::InputTag("addPileupInfo", "bunchSpacing"));
-  overRide_ = false;
-  if (iConfig.exists("overrideBunchSpacing")) {
-    overRide_ = iConfig.getParameter<bool>("overrideBunchSpacing");
-    if (overRide_) {
-      bunchSpacingOverride_ = iConfig.getParameter<unsigned int>("bunchSpacingOverride");
-    }
-  }
+  overRide_ = iConfig.getParameter<bool>("overrideBunchSpacing");
+  bunchSpacingOverride_ = iConfig.getParameter<unsigned int>("bunchSpacingOverride");
 }
 
 BunchSpacingProducer::~BunchSpacingProducer() {}
@@ -82,7 +77,7 @@ void BunchSpacingProducer::fillDescriptions(edm::ConfigurationDescriptions& desc
   desc.add<bool>("overrideBunchSpacing", false);       // true for prompt reco
   desc.add<unsigned int>("bunchSpacingOverride", 25);  // override value
 
-  descriptions.add("bunchSpacingProducer", desc);
+  descriptions.add("BunchSpacingProducer", desc);
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"

diff --git a/RecoLuminosity/LumiProducer/python/bunchSpacingProducer_cfi.py b/RecoLuminosity/LumiProducer/python/bunchSpacingProducer_cfi.py
@@ -1,6 +1,9 @@
 import FWCore.ParameterSet.Config as cms
-bunchSpacingProducer = cms.EDProducer("BunchSpacingProducer")
+
+import RecoLuminosity.LumiProducer.BunchSpacingProducer_cfi as _mod
+
+bunchSpacingProducer = _mod.BunchSpacingProducer.clone()
 
 from Configuration.Eras.Modifier_run2_50ns_specific_cff import run2_50ns_specific
-run2_50ns_specific.toModify( bunchSpacingProducer, bunchSpacingOverride = cms.uint32(50))
-run2_50ns_specific.toModify( bunchSpacingProducer, overrideBunchSpacing = cms.bool(True))
+run2_50ns_specific.toModify( bunchSpacingProducer, bunchSpacingOverride = 50)
+run2_50ns_specific.toModify( bunchSpacingProducer, overrideBunchSpacing = True)