Merge pull request #22057 from gartung/CalibCalorimetry-HcalPlugins-E…

…SProdoucer-returntype CalibCalorimetry/HcalPlugins: Change return type of ESProducer to unique_ptr.
cms-sw · Feb 2, 2018 · 551ee12 · 551ee12
2 parents f31a28d + 5b4c7a0
commit 551ee12
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.cc b/CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.cc
@@ -67,17 +67,14 @@ HBHEDarkeningEP::produce(const HBHEDarkeningRecord& iRecord) {
 		);
 	}
 
-	ReturnType myResult(
-		new HBHEDarkening(
+	return std::make_unique<HBHEDarkening>(
 			pset_.getParameter<int>("ieta_shift"),
 			pset_.getParameter<double>("drdA"),
 			pset_.getParameter<double>("drdB"),
 			dosemaps,
 			years
-		)
-	);
+		);
 
-	return myResult;
 }
 
 DEFINE_FWK_EVENTSETUP_SOURCE(HBHEDarkeningEP);
diff --git a/CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.h b/CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.h
@@ -21,7 +21,7 @@ class HBHEDarkeningEP : public edm::ESProducer, public edm::EventSetupRecordInte
 		HBHEDarkeningEP(const edm::ParameterSet&);
 		~HBHEDarkeningEP() override;
 
-		typedef std::shared_ptr<HBHEDarkening> ReturnType;
+		typedef std::unique_ptr<HBHEDarkening> ReturnType;
 
 		static void fillDescriptions( edm::ConfigurationDescriptions & descriptions );
 

diff --git a/CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc b/CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.cc
@@ -56,10 +56,7 @@ HcalTimeSlewEP::produce(const HcalTimeSlewRecord& iRecord){
   std::vector<edm::ParameterSet> p_TimeSlewM2 = pset_.getParameter<std::vector<edm::ParameterSet>>("timeSlewParametersM2");
   std::vector<edm::ParameterSet> p_TimeSlewM3 = pset_.getParameter<std::vector<edm::ParameterSet>>("timeSlewParametersM3");
 
-  ReturnType hcalTimeSlew( 
-	  new HcalTimeSlew(	  
-	  )
-  );
+  ReturnType hcalTimeSlew = std::make_unique<HcalTimeSlew>();
 
   //loop over the VPSets  
   for(const auto& p_timeslew : p_TimeSlewM2){

diff --git a/CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.h b/CalibCalorimetry/HcalPlugins/src/HcalTimeSlewEP.h
@@ -21,7 +21,7 @@ class HcalTimeSlewEP : public edm::ESProducer, public edm::EventSetupRecordInter
     HcalTimeSlewEP(const edm::ParameterSet&);
     ~HcalTimeSlewEP();
 
-    typedef std::shared_ptr<HcalTimeSlew> ReturnType;
+    typedef std::unique_ptr<HcalTimeSlew> ReturnType;
 
     static void fillDescriptions( edm::ConfigurationDescriptions & descriptions );