Merge CMSSW_10_5_X into CMSSW_10_5_DEVEL_X.

cms-sw · Feb 13, 2019 · 1c44fe3 · 1c44fe3
2 parents 9ca4080 + 29a8e99
commit 1c44fe3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/SimFastTiming/FastTimingCommon/plugins/FTLDigiProducer.cc b/SimFastTiming/FastTimingCommon/plugins/FTLDigiProducer.cc
@@ -18,8 +18,7 @@ FTLDigiProducer::FTLDigiProducer(edm::ParameterSet const& pset, edm::ProducerBas
   for(const auto& psname : psetNames) {
     const auto& ps = pset.getParameterSet(psname);
     const std::string& digitizerName = ps.getParameter<std::string>("digitizerName");
-    auto temp = FTLDigitizerFactory::get()->create(digitizerName,ps,iC,mixMod);
-    theDigitizers_.emplace_back(temp);
+    theDigitizers_.emplace_back(FTLDigitizerFactory::get()->create(digitizerName,ps,iC,mixMod));
   } 
 }
 

diff --git a/SimFastTiming/FastTimingCommon/plugins/MTDDigiProducer.cc b/SimFastTiming/FastTimingCommon/plugins/MTDDigiProducer.cc
@@ -18,8 +18,7 @@ MTDDigiProducer::MTDDigiProducer(edm::ParameterSet const& pset, edm::ProducerBas
   for(const auto& psname : psetNames) {
     const auto& ps = pset.getParameterSet(psname);
     const std::string& digitizerName = ps.getParameter<std::string>("digitizerName");
-    auto temp = MTDDigitizerFactory::get()->create(digitizerName,ps,iC,mixMod);
-    theDigitizers_.emplace_back(temp);
+    theDigitizers_.emplace_back(MTDDigitizerFactory::get()->create(digitizerName,ps,iC,mixMod));
   } 
 }
 

diff --git a/SimTracker/TrackAssociation/plugins/TrackTimeValueMapProducer.cc b/SimTracker/TrackAssociation/plugins/TrackTimeValueMapProducer.cc
@@ -98,8 +98,7 @@ TrackTimeValueMapProducer::TrackTimeValueMapProducer(const edm::ParameterSet& co
   const std::vector<edm::ParameterSet>& resos = conf.getParameterSetVector("resolutionModels");
   for( const auto& reso : resos ) {
     const std::string& name = reso.getParameter<std::string>("modelName");
-    ResolutionModel* resomod = ResolutionModelFactory::get()->create(name,reso);
-    resolutions_.emplace_back( resomod );  
+    resolutions_.emplace_back( ResolutionModelFactory::get()->create(name,reso) );
 
     // times and time resolutions for general tracks
     produces<edm::ValueMap<float> >(tracksName_+name);