Merge CMSSW_10_5_X into CMSSW_10_5_DEVEL_X.

cms-sw · Feb 4, 2019 · a25c02d · a25c02d
2 parents 829c852 + 5a1e9c4
commit a25c02d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/HGCalRecHitProducer.cc b/RecoLocalCalo/HGCalRecProducers/plugins/HGCalRecHitProducer.cc
@@ -48,13 +48,12 @@ HGCalRecHitProducer::HGCalRecHitProducer(const edm::ParameterSet& ps) :
   hebUncalibRecHitCollection_( consumes<HGChebUncalibratedRecHitCollection>( ps.getParameter<edm::InputTag>("HGCHEBuncalibRecHitCollection") ) ),
   eeRechitCollection_( ps.getParameter<std::string>("HGCEErechitCollection") ),
   hefRechitCollection_( ps.getParameter<std::string>("HGCHEFrechitCollection") ),
-  hebRechitCollection_( ps.getParameter<std::string>("HGCHEBrechitCollection") ) {  
+  hebRechitCollection_( ps.getParameter<std::string>("HGCHEBrechitCollection") ),
+  worker_{ HGCalRecHitWorkerFactory::get()->create(ps.getParameter<std::string>("algo"), ps) }
+{
   produces< HGCeeRecHitCollection >(eeRechitCollection_);
   produces< HGChefRecHitCollection >(hefRechitCollection_);
   produces< HGChebRecHitCollection >(hebRechitCollection_);
-
-  const std::string& componentType = ps.getParameter<std::string>("algo");
-  worker_.reset( HGCalRecHitWorkerFactory::get()->create(componentType, ps) );
 }
 
 HGCalRecHitProducer::~HGCalRecHitProducer() {

diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/HGCalUncalibRecHitProducer.cc b/RecoLocalCalo/HGCalRecProducers/plugins/HGCalUncalibRecHitProducer.cc
@@ -15,15 +15,13 @@ HGCalUncalibRecHitProducer::HGCalUncalibRecHitProducer(const edm::ParameterSet&
   hebDigiCollection_( consumes<HGCalDigiCollection>( ps.getParameter<edm::InputTag>("HGCHEBdigiCollection") ) ),
   eeHitCollection_( ps.getParameter<std::string>("HGCEEhitCollection") ),
   hefHitCollection_( ps.getParameter<std::string>("HGCHEFhitCollection") ),
-  hebHitCollection_( ps.getParameter<std::string>("HGCHEBhitCollection") )
+  hebHitCollection_( ps.getParameter<std::string>("HGCHEBhitCollection") ),
+  worker_{ HGCalUncalibRecHitWorkerFactory::get()->create(ps.getParameter<std::string>("algo"), ps) }
 {
 
   produces< HGCeeUncalibratedRecHitCollection >(eeHitCollection_);
   produces< HGChefUncalibratedRecHitCollection >(hefHitCollection_);
   produces< HGChebUncalibratedRecHitCollection >(hebHitCollection_);
-
-  const std::string& componentType = ps.getParameter<std::string>("algo");
-  worker_.reset( HGCalUncalibRecHitWorkerFactory::get()->create(componentType, ps) );
 
 }