From 4f4722688938abdfd9fb1f37a1c84c239d21bf35 Mon Sep 17 00:00:00 2001 From: Jeongeun Lee Date: Wed, 8 Jun 2022 07:30:46 +0200 Subject: [PATCH 1/3] cleanup exist in PhysicsTools --- .../plugins/JetCorrFactorsProducer.cc | 35 +++---------------- .../PatAlgos/plugins/PATElectronProducer.cc | 13 ++----- .../PatAlgos/plugins/PATMuonProducer.cc | 13 ++----- .../PatAlgos/plugins/PATPhotonProducer.cc | 16 ++------- .../PatAlgos/plugins/PATTauProducer.cc | 14 ++------ 5 files changed, 15 insertions(+), 76 deletions(-) diff --git a/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc b/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc index 168329e6264b6..485d0dbcfbbbc 100644 --- a/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc @@ -174,32 +174,15 @@ JetCorrFactorsProducer::JetCorrFactorsProducer(const edm::ParameterSet& cfg) // L1Offset correction, which is an additional input to the L1JPTOffset // corrector if (std::find(levels.begin(), levels.end(), "L1JPTOffset") != levels.end()) { - if (cfg.existsAs("extraJPTOffset")) { - extraJPTOffset_.push_back(cfg.getParameter("extraJPTOffset")); - } else { - throw cms::Exception("No parameter extraJPTOffset specified") - << "The configured correction levels contain a L1JPTOffset correction, which re- \n" - << "quires the additional parameter extraJPTOffset or type std::string. This \n" - << "string should correspond to the L1Offset corrections that should be applied \n" - << "together with the JPTL1Offset corrections. These corrections can be of type \n" - << "L1Offset or L1FastJet. \n"; - } + extraJPTOffset_.push_back(cfg.getParameter("extraJPTOffset")); } // if the std::string L1Offset can be found in levels an additional para- // meter primaryVertices is needed, which should pass on the offline pri- // mary vertex collection. The size of this collection is needed for the // L1Offset correction. if (useNPV_) { - if (cfg.existsAs("primaryVertices")) { - primaryVertices_ = cfg.getParameter("primaryVertices"); - primaryVerticesToken_ = mayConsume >(primaryVertices_); - } else { - throw cms::Exception("No primaryVertices specified") - << "The configured correction levels contain an L1Offset or L1FastJet correction, \n" - << "which requires the number of offlinePrimaryVertices. Please specify this col- \n" - << "lection as additional optional parameter primaryVertices of type edm::InputTag\n" - << "in the jetCorrFactors module. \n"; - } + primaryVertices_ = cfg.getParameter("primaryVertices"); + primaryVerticesToken_ = mayConsume >(primaryVertices_); } // if the std::string L1FastJet can be found in levels an additional // parameter rho is needed, which should pass on the energy density @@ -207,16 +190,8 @@ JetCorrFactorsProducer::JetCorrFactorsProducer(const edm::ParameterSet& cfg) if (useRho_) { if ((!extraJPTOffset_.empty() && extraJPTOffset_.front() == std::string("L1FastJet")) || std::find(levels.begin(), levels.end(), "L1FastJet") != levels.end()) { - if (cfg.existsAs("rho")) { - rho_ = cfg.getParameter("rho"); - rhoToken_ = mayConsume(rho_); - } else { - throw cms::Exception("No parameter rho specified") - << "The configured correction levels contain a L1FastJet correction, which re- \n" - << "quires the energy density parameter rho. Please specify this collection as \n" - << "additional optional parameter rho of type edm::InputTag in the jetCorrFac- \n" - << "tors module. \n"; - } + rho_ = cfg.getParameter("rho"); + rhoToken_ = mayConsume(rho_); } else { edm::LogInfo message("Parameter rho not used"); message << "Module is configured to use the parameter rho, but rho is only used \n" diff --git a/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc b/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc index 7601f81769617..e15d26a6dd30a 100644 --- a/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc @@ -316,10 +316,7 @@ PATElectronProducer::PATElectronProducer(const edm::ParameterSet& iConfig) pvToken_(mayConsume>(iConfig.getParameter("pvSrc"))), addElecID_(iConfig.getParameter("addElectronID")), pTComparator_(), - isolator_(iConfig.exists("userIsolation") ? iConfig.getParameter("userIsolation") - : edm::ParameterSet(), - consumesCollector(), - false), + isolator_(iConfig.getParameter("userIsolation"), consumesCollector(), false), addEfficiencies_(iConfig.getParameter("addEfficiencies")), addResolutions_(iConfig.getParameter("addResolutions")), useUserData_(iConfig.exists("userData")), @@ -328,14 +325,8 @@ PATElectronProducer::PATElectronProducer(const edm::ParameterSet& iConfig) // MC matching configurables (scheduled mode) if (addGenMatch_) { - if (iConfig.existsAs("genParticleMatch")) { - genMatchTokens_.push_back(consumes>( + genMatchTokens_.push_back(consumes>( iConfig.getParameter("genParticleMatch"))); - } else { - genMatchTokens_ = edm::vector_transform( - iConfig.getParameter>("genParticleMatch"), - [this](edm::InputTag const& tag) { return consumes>(tag); }); - } } // resolution configurables if (addResolutions_) { diff --git a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc index 59e540d633109..86d8c0ee04855 100644 --- a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc @@ -352,10 +352,7 @@ PATMuonProducer::PATMuonProducer(const edm::ParameterSet& iConfig, PATMuonHeavyO computeSoftMuonMVA_(false), recomputeBasicSelectors_(false), mvaUseJec_(false), - isolator_(iConfig.exists("userIsolation") ? iConfig.getParameter("userIsolation") - : edm::ParameterSet(), - consumesCollector(), - false), + isolator_(iConfig.getParameter("userIsolation"), consumesCollector(), false), geometryToken_{esConsumes()}, transientTrackBuilderToken_{esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))}, patMuonPutToken_{produces>()} { @@ -394,14 +391,8 @@ PATMuonProducer::PATMuonProducer(const edm::ParameterSet& iConfig, PATMuonHeavyO addGenMatch_ = iConfig.getParameter("addGenMatch"); if (addGenMatch_) { embedGenMatch_ = iConfig.getParameter("embedGenMatch"); - if (iConfig.existsAs("genParticleMatch")) { - genMatchTokens_.push_back(consumes>( + genMatchTokens_.push_back(consumes>( iConfig.getParameter("genParticleMatch"))); - } else { - genMatchTokens_ = edm::vector_transform( - iConfig.getParameter>("genParticleMatch"), - [this](edm::InputTag const& tag) { return consumes>(tag); }); - } } // efficiencies addEfficiencies_ = iConfig.getParameter("addEfficiencies"); diff --git a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc index e44054c58a6a0..ed55e5c12b9ba 100644 --- a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc @@ -194,12 +194,8 @@ using namespace pat; PATPhotonProducer::PATPhotonProducer(const edm::ParameterSet& iConfig) : - ecalClusterToolsESGetTokens_{consumesCollector()}, - isolator_(iConfig.exists("userIsolation") ? iConfig.getParameter("userIsolation") - : edm::ParameterSet(), - consumesCollector(), - false), + isolator_(iConfig.getParameter("userIsolation"), consumesCollector(), false), useUserData_(iConfig.exists("userData")), ecalTopologyToken_{esConsumes()}, ecalGeometryToken_{esConsumes()} { @@ -221,14 +217,8 @@ PATPhotonProducer::PATPhotonProducer(const edm::ParameterSet& iConfig) addGenMatch_ = iConfig.getParameter("addGenMatch"); if (addGenMatch_) { embedGenMatch_ = iConfig.getParameter("embedGenMatch"); - if (iConfig.existsAs("genParticleMatch")) { - genMatchTokens_.push_back(consumes>( - iConfig.getParameter("genParticleMatch"))); - } else { - genMatchTokens_ = edm::vector_transform( - iConfig.getParameter>("genParticleMatch"), - [this](edm::InputTag const& tag) { return consumes>(tag); }); - } + genMatchTokens_.push_back(consumes>( + iConfig.getParameter("genParticleMatch"))); } // Efficiency configurables addEfficiencies_ = iConfig.getParameter("addEfficiencies"); diff --git a/PhysicsTools/PatAlgos/plugins/PATTauProducer.cc b/PhysicsTools/PatAlgos/plugins/PATTauProducer.cc index 6067a789f96f5..cfcb3377fd7fa 100644 --- a/PhysicsTools/PatAlgos/plugins/PATTauProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATTauProducer.cc @@ -141,10 +141,8 @@ namespace pat { using namespace pat; PATTauProducer::PATTauProducer(const edm::ParameterSet& iConfig) - : isolator_(iConfig.exists("userIsolation") ? iConfig.getParameter("userIsolation") - : edm::ParameterSet(), - consumesCollector(), - false), + : + isolator_(iConfig.getParameter("userIsolation"), consumesCollector(), false), useUserData_(iConfig.exists("userData")), posAtECalEntranceComputer_(consumesCollector()) { firstOccurence_ = true; @@ -170,14 +168,8 @@ PATTauProducer::PATTauProducer(const edm::ParameterSet& iConfig) addGenMatch_ = iConfig.getParameter("addGenMatch"); if (addGenMatch_) { embedGenMatch_ = iConfig.getParameter("embedGenMatch"); - if (iConfig.existsAs("genParticleMatch")) { - genMatchTokens_.push_back(consumes>( + genMatchTokens_.push_back(consumes>( iConfig.getParameter("genParticleMatch"))); - } else { - genMatchTokens_ = edm::vector_transform( - iConfig.getParameter>("genParticleMatch"), - [this](edm::InputTag const& tag) { return consumes>(tag); }); - } } addGenJetMatch_ = iConfig.getParameter("addGenJetMatch"); if (addGenJetMatch_) { From 2a92e5e2e4a6358bf710570d195da6f6519875fb Mon Sep 17 00:00:00 2001 From: Jeongeun Lee Date: Wed, 8 Jun 2022 08:56:51 +0200 Subject: [PATCH 2/3] fix code-format --- PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc | 8 ++++---- PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc | 2 +- PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc | 2 +- PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc | 5 ++--- PhysicsTools/PatAlgos/plugins/PATTauProducer.cc | 5 ++--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc b/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc index 485d0dbcfbbbc..668d9c06607ca 100644 --- a/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/JetCorrFactorsProducer.cc @@ -181,8 +181,8 @@ JetCorrFactorsProducer::JetCorrFactorsProducer(const edm::ParameterSet& cfg) // mary vertex collection. The size of this collection is needed for the // L1Offset correction. if (useNPV_) { - primaryVertices_ = cfg.getParameter("primaryVertices"); - primaryVerticesToken_ = mayConsume >(primaryVertices_); + primaryVertices_ = cfg.getParameter("primaryVertices"); + primaryVerticesToken_ = mayConsume >(primaryVertices_); } // if the std::string L1FastJet can be found in levels an additional // parameter rho is needed, which should pass on the energy density @@ -190,8 +190,8 @@ JetCorrFactorsProducer::JetCorrFactorsProducer(const edm::ParameterSet& cfg) if (useRho_) { if ((!extraJPTOffset_.empty() && extraJPTOffset_.front() == std::string("L1FastJet")) || std::find(levels.begin(), levels.end(), "L1FastJet") != levels.end()) { - rho_ = cfg.getParameter("rho"); - rhoToken_ = mayConsume(rho_); + rho_ = cfg.getParameter("rho"); + rhoToken_ = mayConsume(rho_); } else { edm::LogInfo message("Parameter rho not used"); message << "Module is configured to use the parameter rho, but rho is only used \n" diff --git a/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc b/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc index e15d26a6dd30a..303f2195f214b 100644 --- a/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc @@ -326,7 +326,7 @@ PATElectronProducer::PATElectronProducer(const edm::ParameterSet& iConfig) if (addGenMatch_) { genMatchTokens_.push_back(consumes>( - iConfig.getParameter("genParticleMatch"))); + iConfig.getParameter("genParticleMatch"))); } // resolution configurables if (addResolutions_) { diff --git a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc index 86d8c0ee04855..fefcf3db7c3d2 100644 --- a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc @@ -392,7 +392,7 @@ PATMuonProducer::PATMuonProducer(const edm::ParameterSet& iConfig, PATMuonHeavyO if (addGenMatch_) { embedGenMatch_ = iConfig.getParameter("embedGenMatch"); genMatchTokens_.push_back(consumes>( - iConfig.getParameter("genParticleMatch"))); + iConfig.getParameter("genParticleMatch"))); } // efficiencies addEfficiencies_ = iConfig.getParameter("addEfficiencies"); diff --git a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc index ed55e5c12b9ba..46deba6ff8be8 100644 --- a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc @@ -193,8 +193,7 @@ void pat::PATPhotonProducer::readIsolationLabels(const edm::ParameterSet& iConfi using namespace pat; PATPhotonProducer::PATPhotonProducer(const edm::ParameterSet& iConfig) - : - ecalClusterToolsESGetTokens_{consumesCollector()}, + : ecalClusterToolsESGetTokens_{consumesCollector()}, isolator_(iConfig.getParameter("userIsolation"), consumesCollector(), false), useUserData_(iConfig.exists("userData")), ecalTopologyToken_{esConsumes()}, @@ -218,7 +217,7 @@ PATPhotonProducer::PATPhotonProducer(const edm::ParameterSet& iConfig) if (addGenMatch_) { embedGenMatch_ = iConfig.getParameter("embedGenMatch"); genMatchTokens_.push_back(consumes>( - iConfig.getParameter("genParticleMatch"))); + iConfig.getParameter("genParticleMatch"))); } // Efficiency configurables addEfficiencies_ = iConfig.getParameter("addEfficiencies"); diff --git a/PhysicsTools/PatAlgos/plugins/PATTauProducer.cc b/PhysicsTools/PatAlgos/plugins/PATTauProducer.cc index cfcb3377fd7fa..98732a5369664 100644 --- a/PhysicsTools/PatAlgos/plugins/PATTauProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATTauProducer.cc @@ -141,8 +141,7 @@ namespace pat { using namespace pat; PATTauProducer::PATTauProducer(const edm::ParameterSet& iConfig) - : - isolator_(iConfig.getParameter("userIsolation"), consumesCollector(), false), + : isolator_(iConfig.getParameter("userIsolation"), consumesCollector(), false), useUserData_(iConfig.exists("userData")), posAtECalEntranceComputer_(consumesCollector()) { firstOccurence_ = true; @@ -169,7 +168,7 @@ PATTauProducer::PATTauProducer(const edm::ParameterSet& iConfig) if (addGenMatch_) { embedGenMatch_ = iConfig.getParameter("embedGenMatch"); genMatchTokens_.push_back(consumes>( - iConfig.getParameter("genParticleMatch"))); + iConfig.getParameter("genParticleMatch"))); } addGenJetMatch_ = iConfig.getParameter("addGenJetMatch"); if (addGenJetMatch_) { From 8628b0975dab697fa21ed249a54488dbd527eee7 Mon Sep 17 00:00:00 2001 From: Jeongeun Lee Date: Wed, 8 Jun 2022 14:05:32 +0200 Subject: [PATCH 3/3] fix PATMuonProducer.cc --- PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc index fefcf3db7c3d2..50605edbd950a 100644 --- a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc @@ -391,8 +391,14 @@ PATMuonProducer::PATMuonProducer(const edm::ParameterSet& iConfig, PATMuonHeavyO addGenMatch_ = iConfig.getParameter("addGenMatch"); if (addGenMatch_) { embedGenMatch_ = iConfig.getParameter("embedGenMatch"); - genMatchTokens_.push_back(consumes>( - iConfig.getParameter("genParticleMatch"))); + if (iConfig.existsAs("genParticleMatch")) { + genMatchTokens_.push_back(consumes>( + iConfig.getParameter("genParticleMatch"))); + } else { + genMatchTokens_ = edm::vector_transform( + iConfig.getParameter>("genParticleMatch"), + [this](edm::InputTag const& tag) { return consumes>(tag); }); + } } // efficiencies addEfficiencies_ = iConfig.getParameter("addEfficiencies");