Merge pull request #27193 from makortel/pluginFactoryCleanupPhysicsTools

Remove redundant unique_ptr constructor calls from PhysicsTools
cms-sw · Jun 16, 2019 · 9576b29 · 9576b29
2 parents 81cfbcd + a7dbd2f
commit 9576b29
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/PhysicsTools/IsolationAlgos/plugins/CandIsoDepositProducer.cc b/PhysicsTools/IsolationAlgos/plugins/CandIsoDepositProducer.cc
@@ -37,8 +37,7 @@ CandIsoDepositProducer::CandIsoDepositProducer(const ParameterSet &par)
 
   edm::ParameterSet extractorPSet = theConfig.getParameter<edm::ParameterSet>("ExtractorPSet");
   std::string extractorName = extractorPSet.getParameter<std::string>("ComponentName");
-  theExtractor = std::unique_ptr<reco::isodeposit::IsoDepositExtractor>{
-      IsoDepositExtractorFactory::get()->create(extractorName, extractorPSet, consumesCollector())};
+  theExtractor = IsoDepositExtractorFactory::get()->create(extractorName, extractorPSet, consumesCollector());
 
   if (!theMultipleDepositsFlag)
     produces<reco::IsoDepositMap>();

diff --git a/PhysicsTools/UtilAlgos/interface/Selections.h b/PhysicsTools/UtilAlgos/interface/Selections.h
@@ -20,8 +20,7 @@ class Filter {
       const std::string d("name");
       iConfig.addUntrackedParameter<std::string>(d, name);
       std::string componentName = iConfig.getParameter<std::string>("selector");
-      selector_ =
-          std::unique_ptr<EventSelector>(EventSelectorFactoryFromHelper::get()->create(componentName, iConfig, iC));
+      selector_ = EventSelectorFactoryFromHelper::get()->create(componentName, iConfig, iC);
       if (iConfig.exists("description"))
         description_ = iConfig.getParameter<std::vector<std::string> >("description");
       else

diff --git a/PhysicsTools/UtilAlgos/plugins/ConfigurableAnalysis.cc b/PhysicsTools/UtilAlgos/plugins/ConfigurableAnalysis.cc
@@ -90,14 +90,14 @@ ConfigurableAnalysis::ConfigurableAnalysis(const edm::ParameterSet& iConfig) {
   edm::ParameterSet plotPset = iConfig.getParameter<edm::ParameterSet>("Plotter");
   if (!plotPset.empty()) {
     std::string plotterName = plotPset.getParameter<std::string>("ComponentName");
-    plotter_ = std::unique_ptr<Plotter>(PlotterFactory::get()->create(plotterName, plotPset));
+    plotter_ = PlotterFactory::get()->create(plotterName, plotPset);
   }
 
   //ntupling device
   edm::ParameterSet ntPset = iConfig.getParameter<edm::ParameterSet>("Ntupler");
   if (!ntPset.empty()) {
     std::string ntuplerName = ntPset.getParameter<std::string>("ComponentName");
-    ntupler_ = std::unique_ptr<NTupler>(NTuplerFactory::get()->create(ntuplerName, ntPset));
+    ntupler_ = NTuplerFactory::get()->create(ntuplerName, ntPset);
   }
 
   flows_ = iConfig.getParameter<std::vector<std::string>>("flows");

diff --git a/PhysicsTools/UtilAlgos/plugins/NTuplingDevice.cc b/PhysicsTools/UtilAlgos/plugins/NTuplingDevice.cc
@@ -63,7 +63,7 @@ NTuplingDevice::NTuplingDevice(const edm::ParameterSet& iConfig) {
   //this Ntupler can work with the InputTagDistributor, but should not be configured as such.
   edm::ParameterSet ntPset = iConfig.getParameter<edm::ParameterSet>("Ntupler");
   std::string ntuplerName = ntPset.getParameter<std::string>("ComponentName");
-  ntupler_ = std::unique_ptr<NTupler>(NTuplerFactory::get()->create(ntuplerName, ntPset));
+  ntupler_ = NTuplerFactory::get()->create(ntuplerName, ntPset);
 
   //register the leaves from the ntupler
   ntupler_->registerleaves(this);

diff --git a/PhysicsTools/UtilAlgos/plugins/PlottingDevice.cc b/PhysicsTools/UtilAlgos/plugins/PlottingDevice.cc
@@ -77,7 +77,7 @@ PlottingDevice::PlottingDevice(const edm::ParameterSet& iConfig) {
   //configure the plotting device
   edm::ParameterSet plotPset = iConfig.getParameter<edm::ParameterSet>("Plotter");
   std::string plotterName = plotPset.getParameter<std::string>("ComponentName");
-  plotter_ = std::unique_ptr<Plotter>(PlotterFactory::get()->create(plotterName, plotPset));
+  plotter_ = PlotterFactory::get()->create(plotterName, plotPset);
 }
 
 PlottingDevice::~PlottingDevice() {}