From 27b0a9110ec584d4eb5b35119228420a50cf1e6e Mon Sep 17 00:00:00 2001 From: matthieu Date: Mon, 7 Nov 2016 09:46:40 +0100 Subject: [PATCH] cleaning --- .../PatUtils/interface/SmearedJetProducerT.h | 12 ++++++------ RecoMET/METAlgorithms/src/METSignificance.cc | 16 +++++++--------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/PhysicsTools/PatUtils/interface/SmearedJetProducerT.h b/PhysicsTools/PatUtils/interface/SmearedJetProducerT.h index 995c82d936836..3a30d392873b8 100644 --- a/PhysicsTools/PatUtils/interface/SmearedJetProducerT.h +++ b/PhysicsTools/PatUtils/interface/SmearedJetProducerT.h @@ -131,7 +131,7 @@ class SmearedJetProducerT : public edm::stream::EDProducer<> { m_genJetMatcher = std::make_shared(cfg, consumesCollector()); std::int32_t variation = cfg.getParameter("variation"); - _nomVar=1; + m_nomVar=1; if (variation == 0) m_systematic_variation = Variation::NOMINAL; else if (variation == 1) @@ -140,11 +140,11 @@ class SmearedJetProducerT : public edm::stream::EDProducer<> { m_systematic_variation = Variation::DOWN; else if (variation == 101) { m_systematic_variation = Variation::NOMINAL; - _nomVar=1; + m_nomVar=1; } else if (variation == -101) { m_systematic_variation = Variation::NOMINAL; - _nomVar=-1; + m_nomVar=-1; } else throw edm::Exception(edm::errors::ConfigFileReadError, "Invalid value for 'variation' parameter. Only -1, 0, 1 or 101, -101 are supported."); @@ -243,7 +243,7 @@ class SmearedJetProducerT : public edm::stream::EDProducer<> { } double dPt = jet.pt() - genJet->pt(); - smearFactor = 1 + _nomVar*(jer_sf - 1.) * dPt / jet.pt(); + smearFactor = 1 + m_nomVar*(jer_sf - 1.) * dPt / jet.pt(); } else if (jer_sf > 1) { /* @@ -256,7 +256,7 @@ class SmearedJetProducerT : public edm::stream::EDProducer<> { } std::normal_distribution<> d(0, sigma); - smearFactor = 1. + _nomVar*d(m_random_generator); + smearFactor = 1. + m_nomVar*d(m_random_generator); } else if (m_debug) { std::cout << "Impossible to smear this jet" << std::endl; } @@ -308,6 +308,6 @@ class SmearedJetProducerT : public edm::stream::EDProducer<> { GreaterByPt jetPtComparator; - int _nomVar; + int m_nomVar; }; #endif diff --git a/RecoMET/METAlgorithms/src/METSignificance.cc b/RecoMET/METAlgorithms/src/METSignificance.cc index 54287d242be6f..3ba29c5a9398c 100644 --- a/RecoMET/METAlgorithms/src/METSignificance.cc +++ b/RecoMET/METAlgorithms/src/METSignificance.cc @@ -20,17 +20,15 @@ Description: [one line class summary] metsig::METSignificance::METSignificance(const edm::ParameterSet& iConfig) { - // if(iConfig.exists("parameters")) { - edm::ParameterSet cfgParams = iConfig.getParameter("parameters"); + edm::ParameterSet cfgParams = iConfig.getParameter("parameters"); - double dRmatch = cfgParams.getParameter("dRMatch"); - dR2match_ = dRmatch*dRmatch; + double dRmatch = cfgParams.getParameter("dRMatch"); + dR2match_ = dRmatch*dRmatch; - jetThreshold_ = cfgParams.getParameter("jetThreshold"); - jetEtas_ = cfgParams.getParameter >("jeta"); - jetParams_ = cfgParams.getParameter >("jpar"); - pjetParams_ = cfgParams.getParameter >("pjpar"); - // } + jetThreshold_ = cfgParams.getParameter("jetThreshold"); + jetEtas_ = cfgParams.getParameter >("jeta"); + jetParams_ = cfgParams.getParameter >("jpar"); + pjetParams_ = cfgParams.getParameter >("pjpar"); }