From 1ae065ac11a26c21f950d1afa3fa8b962dd7862b Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Fri, 26 Jan 2018 22:05:53 +0100 Subject: [PATCH] JetMETCorrections/Modules: Change return type of EDProducers. Remove class member not needed. --- .../Modules/interface/JetCorrectionESChain.h | 3 +-- .../Modules/interface/JetCorrectionESProducer.h | 4 ++-- .../Modules/interface/JetResolutionESProducer.h | 8 ++++---- .../Modules/interface/QGLikelihoodESProducer.h | 2 +- .../interface/QGLikelihoodSystematicsESProducer.h | 2 +- JetMETCorrections/Modules/src/JetCorrectionESChain.cc | 9 ++++----- JetMETCorrections/Modules/src/QGLikelihoodESProducer.cc | 4 ++-- .../Modules/src/QGLikelihoodSystematicsESProducer.cc | 4 ++-- 8 files changed, 17 insertions(+), 19 deletions(-) diff --git a/JetMETCorrections/Modules/interface/JetCorrectionESChain.h b/JetMETCorrections/Modules/interface/JetCorrectionESChain.h index 26d4f7904a22d..b2d346c3abff9 100644 --- a/JetMETCorrections/Modules/interface/JetCorrectionESChain.h +++ b/JetMETCorrections/Modules/interface/JetCorrectionESChain.h @@ -25,10 +25,9 @@ class JetCorrectionESChain : public edm::ESProducer { JetCorrectionESChain(edm::ParameterSet const& fParameters); ~JetCorrectionESChain() override; - std::shared_ptr produce(JetCorrectionsRecord const& ); + std::unique_ptr produce(JetCorrectionsRecord const& ); private: std::vector mCorrectors; - std::shared_ptr mChainCorrector; }; #endif diff --git a/JetMETCorrections/Modules/interface/JetCorrectionESProducer.h b/JetMETCorrections/Modules/interface/JetCorrectionESProducer.h index 83336429cb78d..d62f9124e018d 100644 --- a/JetMETCorrections/Modules/interface/JetCorrectionESProducer.h +++ b/JetMETCorrections/Modules/interface/JetCorrectionESProducer.h @@ -42,12 +42,12 @@ class JetCorrectionESProducer : public edm::ESProducer ~JetCorrectionESProducer() override {} - std::shared_ptr produce(JetCorrectionsRecord const& iRecord) + std::unique_ptr produce(JetCorrectionsRecord const& iRecord) { edm::ESHandle JetCorParColl; iRecord.get(mAlgo,JetCorParColl); JetCorrectorParameters const& JetCorPar = (*JetCorParColl)[mLevel]; - return std::make_shared(JetCorPar, mParameterSet); + return std::make_unique(JetCorPar, mParameterSet); } }; #endif diff --git a/JetMETCorrections/Modules/interface/JetResolutionESProducer.h b/JetMETCorrections/Modules/interface/JetResolutionESProducer.h index 00f5c31a962ba..40b0053c7c3fa 100644 --- a/JetMETCorrections/Modules/interface/JetResolutionESProducer.h +++ b/JetMETCorrections/Modules/interface/JetResolutionESProducer.h @@ -31,7 +31,7 @@ class JetResolutionESProducer : public edm::ESProducer ~JetResolutionESProducer() override {} - std::shared_ptr produce(JetResolutionRcd const& iRecord) { + std::unique_ptr produce(JetResolutionRcd const& iRecord) { // Get object from record edm::ESHandle jerObjectHandle; @@ -39,7 +39,7 @@ class JetResolutionESProducer : public edm::ESProducer // Convert this object to a JetResolution object JME::JetResolutionObject const& jerObject = (*jerObjectHandle); - return std::make_shared(jerObject); + return std::make_unique(jerObject); } }; @@ -57,7 +57,7 @@ class JetResolutionScaleFactorESProducer : public edm::ESProducer ~JetResolutionScaleFactorESProducer() override {} - std::shared_ptr produce(JetResolutionScaleFactorRcd const& iRecord) { + std::unique_ptr produce(JetResolutionScaleFactorRcd const& iRecord) { // Get object from record edm::ESHandle jerObjectHandle; @@ -65,7 +65,7 @@ class JetResolutionScaleFactorESProducer : public edm::ESProducer // Convert this object to a JetResolution object JME::JetResolutionObject const& jerObject = (*jerObjectHandle); - return std::make_shared(jerObject); + return std::make_unique(jerObject); } }; #endif diff --git a/JetMETCorrections/Modules/interface/QGLikelihoodESProducer.h b/JetMETCorrections/Modules/interface/QGLikelihoodESProducer.h index 0750b25e65188..90c3ed9fbb72d 100644 --- a/JetMETCorrections/Modules/interface/QGLikelihoodESProducer.h +++ b/JetMETCorrections/Modules/interface/QGLikelihoodESProducer.h @@ -21,7 +21,7 @@ class QGLikelihoodESProducer : public edm::ESProducer{ QGLikelihoodESProducer(const edm::ParameterSet&); ~QGLikelihoodESProducer() override{}; - std::shared_ptr produce(const QGLikelihoodRcd&); + std::unique_ptr produce(const QGLikelihoodRcd&); void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue &, edm::ValidityInterval &); private: diff --git a/JetMETCorrections/Modules/interface/QGLikelihoodSystematicsESProducer.h b/JetMETCorrections/Modules/interface/QGLikelihoodSystematicsESProducer.h index 9f6779fc43274..f9f78cd4eff83 100644 --- a/JetMETCorrections/Modules/interface/QGLikelihoodSystematicsESProducer.h +++ b/JetMETCorrections/Modules/interface/QGLikelihoodSystematicsESProducer.h @@ -21,7 +21,7 @@ class QGLikelihoodSystematicsESProducer : public edm::ESProducer{ QGLikelihoodSystematicsESProducer(const edm::ParameterSet&); ~QGLikelihoodSystematicsESProducer() override{}; - std::shared_ptr produce(const QGLikelihoodSystematicsRcd&); + std::unique_ptr produce(const QGLikelihoodSystematicsRcd&); void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue &, edm::ValidityInterval &); private: std::string mAlgo; diff --git a/JetMETCorrections/Modules/src/JetCorrectionESChain.cc b/JetMETCorrections/Modules/src/JetCorrectionESChain.cc index 7f410f9036a08..3bf64c767c90a 100644 --- a/JetMETCorrections/Modules/src/JetCorrectionESChain.cc +++ b/JetMETCorrections/Modules/src/JetCorrectionESChain.cc @@ -14,8 +14,7 @@ #include JetCorrectionESChain::JetCorrectionESChain(edm::ParameterSet const& fParameters) - : mCorrectors (fParameters.getParameter < std::vector > ("correctors")), - mChainCorrector (new ChainedJetCorrector ()) + : mCorrectors (fParameters.getParameter < std::vector > ("correctors")) { std::string label(fParameters.getParameter("@module_label")); if (std::find(mCorrectors.begin(), mCorrectors.end(), label) != mCorrectors.end()) { @@ -27,13 +26,13 @@ JetCorrectionESChain::JetCorrectionESChain(edm::ParameterSet const& fParameters) JetCorrectionESChain::~JetCorrectionESChain() {} -std::shared_ptr JetCorrectionESChain::produce(JetCorrectionsRecord const& fRecord) { - ChainedJetCorrector* corrector = dynamic_cast(&*mChainCorrector); +std::unique_ptr JetCorrectionESChain::produce(JetCorrectionsRecord const& fRecord) { + std::unique_ptr corrector{ new ChainedJetCorrector}; corrector->clear (); for (size_t i = 0; i < mCorrectors.size(); ++i) { edm::ESHandle handle; fRecord.get(mCorrectors[i], handle); corrector->push_back(&*handle); } - return mChainCorrector; + return corrector; } diff --git a/JetMETCorrections/Modules/src/QGLikelihoodESProducer.cc b/JetMETCorrections/Modules/src/QGLikelihoodESProducer.cc index 4b912e2e8b206..b223567aa6cae 100644 --- a/JetMETCorrections/Modules/src/QGLikelihoodESProducer.cc +++ b/JetMETCorrections/Modules/src/QGLikelihoodESProducer.cc @@ -25,9 +25,9 @@ void QGLikelihoodESProducer::setIntervalFor(const edm::eventsetup::EventSetupRec } // Produce the data -std::shared_ptr QGLikelihoodESProducer::produce(const QGLikelihoodRcd& iRecord){ +std::unique_ptr QGLikelihoodESProducer::produce(const QGLikelihoodRcd& iRecord){ edm::ESHandle qglObj; iRecord.get(mAlgo, qglObj); - return std::make_shared(*qglObj); + return std::make_unique(*qglObj); } diff --git a/JetMETCorrections/Modules/src/QGLikelihoodSystematicsESProducer.cc b/JetMETCorrections/Modules/src/QGLikelihoodSystematicsESProducer.cc index ec7d6d5f569b4..14167d584a168 100644 --- a/JetMETCorrections/Modules/src/QGLikelihoodSystematicsESProducer.cc +++ b/JetMETCorrections/Modules/src/QGLikelihoodSystematicsESProducer.cc @@ -27,9 +27,9 @@ void QGLikelihoodSystematicsESProducer::setIntervalFor(const edm::eventsetup::Ev } // Produce the data -std::shared_ptr QGLikelihoodSystematicsESProducer::produce(const QGLikelihoodSystematicsRcd& iRecord){ +std::unique_ptr QGLikelihoodSystematicsESProducer::produce(const QGLikelihoodSystematicsRcd& iRecord){ edm::ESHandle qglObj; iRecord.get(mAlgo, qglObj); - return std::make_shared(*qglObj); + return std::make_unique(*qglObj); }