Merge pull request #21991 from gartung/JetMETCorrections-Modules-retu…

…rntype JetMETCorrections/Modules: Change return type of EDProducers.
cms-sw · Jan 29, 2018 · ef381de · ef381de
2 parents 7f4bc8e + 1ae065a
commit ef381de
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 19 deletions.
diff --git 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<JetCorrector> produce(JetCorrectionsRecord const& );
+  std::unique_ptr<JetCorrector> produce(JetCorrectionsRecord const& );
 
 private:
   std::vector <std::string> mCorrectors;
-  std::shared_ptr<JetCorrector> mChainCorrector;
 };
 #endif
diff --git 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<JetCorrector> produce(JetCorrectionsRecord const& iRecord)
+  std::unique_ptr<JetCorrector> produce(JetCorrectionsRecord const& iRecord)
   {
     edm::ESHandle<JetCorrectorParametersCollection> JetCorParColl;
     iRecord.get(mAlgo,JetCorParColl); 
     JetCorrectorParameters const& JetCorPar = (*JetCorParColl)[mLevel];
-    return std::make_shared<Corrector>(JetCorPar, mParameterSet);
+    return std::make_unique<Corrector>(JetCorPar, mParameterSet);
   }
 };
 #endif
diff --git a/JetMETCorrections/Modules/interface/JetResolutionESProducer.h b/JetMETCorrections/Modules/interface/JetResolutionESProducer.h
@@ -31,15 +31,15 @@ class JetResolutionESProducer : public edm::ESProducer
 
         ~JetResolutionESProducer() override {}
 
-        std::shared_ptr<JME::JetResolution> produce(JetResolutionRcd const& iRecord) {
+        std::unique_ptr<JME::JetResolution> produce(JetResolutionRcd const& iRecord) {
 
             // Get object from record
             edm::ESHandle<JME::JetResolutionObject> jerObjectHandle;
             iRecord.get(m_label, jerObjectHandle);
 
             // Convert this object to a JetResolution object
             JME::JetResolutionObject const& jerObject = (*jerObjectHandle);
-            return std::make_shared<JME::JetResolution>(jerObject);
+            return std::make_unique<JME::JetResolution>(jerObject);
         }
 };
 
@@ -57,15 +57,15 @@ class JetResolutionScaleFactorESProducer : public edm::ESProducer
 
         ~JetResolutionScaleFactorESProducer() override {}
 
-        std::shared_ptr<JME::JetResolutionScaleFactor> produce(JetResolutionScaleFactorRcd const& iRecord) {
+        std::unique_ptr<JME::JetResolutionScaleFactor> produce(JetResolutionScaleFactorRcd const& iRecord) {
 
             // Get object from record
             edm::ESHandle<JME::JetResolutionObject> jerObjectHandle;
             iRecord.get(m_label, jerObjectHandle);
 
             // Convert this object to a JetResolution object
             JME::JetResolutionObject const& jerObject = (*jerObjectHandle);
-            return std::make_shared<JME::JetResolutionScaleFactor>(jerObject);
+            return std::make_unique<JME::JetResolutionScaleFactor>(jerObject);
         }
 };
 #endif
diff --git 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<QGLikelihoodObject> produce(const QGLikelihoodRcd&);
+      std::unique_ptr<QGLikelihoodObject> 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
@@ -21,7 +21,7 @@ class QGLikelihoodSystematicsESProducer : public edm::ESProducer{
       QGLikelihoodSystematicsESProducer(const edm::ParameterSet&);
       ~QGLikelihoodSystematicsESProducer() override{};
 
-      std::shared_ptr<QGLikelihoodSystematicsObject> produce(const QGLikelihoodSystematicsRcd&);
+      std::unique_ptr<QGLikelihoodSystematicsObject> 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
@@ -14,8 +14,7 @@
 #include <algorithm>
 
 JetCorrectionESChain::JetCorrectionESChain(edm::ParameterSet const& fParameters) 
-  : mCorrectors (fParameters.getParameter < std::vector<std::string> > ("correctors")),
-    mChainCorrector (new ChainedJetCorrector ())
+  : mCorrectors (fParameters.getParameter < std::vector<std::string> > ("correctors"))
 {
   std::string label(fParameters.getParameter<std::string>("@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<JetCorrector> JetCorrectionESChain::produce(JetCorrectionsRecord const& fRecord) {
-  ChainedJetCorrector* corrector = dynamic_cast<ChainedJetCorrector*>(&*mChainCorrector);
+std::unique_ptr<JetCorrector> JetCorrectionESChain::produce(JetCorrectionsRecord const& fRecord) {
+  std::unique_ptr<ChainedJetCorrector> corrector{ new ChainedJetCorrector};
   corrector->clear ();
   for (size_t i = 0; i < mCorrectors.size(); ++i) {
     edm::ESHandle <JetCorrector> 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
@@ -25,9 +25,9 @@ void QGLikelihoodESProducer::setIntervalFor(const edm::eventsetup::EventSetupRec
 }
 
 // Produce the data
-std::shared_ptr<QGLikelihoodObject> QGLikelihoodESProducer::produce(const QGLikelihoodRcd& iRecord){
+std::unique_ptr<QGLikelihoodObject> QGLikelihoodESProducer::produce(const QGLikelihoodRcd& iRecord){
    edm::ESHandle<QGLikelihoodObject> qglObj;
    iRecord.get(mAlgo, qglObj);
 
-   return std::make_shared<QGLikelihoodObject>(*qglObj);
+   return std::make_unique<QGLikelihoodObject>(*qglObj);
 }
diff --git 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<QGLikelihoodSystematicsObject> QGLikelihoodSystematicsESProducer::produce(const QGLikelihoodSystematicsRcd& iRecord){
+std::unique_ptr<QGLikelihoodSystematicsObject> QGLikelihoodSystematicsESProducer::produce(const QGLikelihoodSystematicsRcd& iRecord){
    edm::ESHandle<QGLikelihoodSystematicsObject> qglObj;
    iRecord.get(mAlgo, qglObj);
 
-   return std::make_shared<QGLikelihoodSystematicsObject>(*qglObj);
+   return std::make_unique<QGLikelihoodSystematicsObject>(*qglObj);
 }