Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.

cms-sw · Mar 19, 2019 · 8b23844 · 8b23844
2 parents de4623d + ee428a9
commit 8b23844
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/TrackPropagation/SteppingHelixPropagator/src/SteppingHelixPropagator.cc b/TrackPropagation/SteppingHelixPropagator/src/SteppingHelixPropagator.cc
@@ -1977,11 +1977,12 @@ SteppingHelixPropagator::refToMagVolume(const SteppingHelixPropagator::StateInfo
     const Surface* cPlane = nullptr; //only need to know the loc->glob transform
     const Cylinder* cCyl = nullptr;
     const Cone* cCone = nullptr;
-    if (typeid(cVolFaces[iFace].surface()) == typeid(const Plane&)){
+    auto& iSurface = cVolFaces[iFace].surface();
+    if (typeid(iSurface) == typeid(const Plane&)){
       cPlane = &cVolFaces[iFace].surface();
-    } else if (typeid(cVolFaces[iFace].surface()) == typeid(const Cylinder&)){
+    } else if (typeid(iSurface) == typeid(const Cylinder&)){
       cCyl = dynamic_cast<const Cylinder*>(&cVolFaces[iFace].surface());
-    } else if (typeid(cVolFaces[iFace].surface()) == typeid(const Cone&)){
+    } else if (typeid(iSurface) == typeid(const Cone&)){
       cCone = dynamic_cast<const Cone*>(&cVolFaces[iFace].surface());
     } else {
       edm::LogWarning(metname)<<std::setprecision(17)<<std::setw(20)<<std::scientific<<"Could not cast a volume side surface to a known type"<<std::endl;

diff --git a/TrackingTools/TrackRefitter/src/TrackTransformerForCosmicMuons.cc b/TrackingTools/TrackRefitter/src/TrackTransformerForCosmicMuons.cc
@@ -334,11 +334,10 @@ vector<Trajectory> TrackTransformerForCosmicMuons::transform(const reco::Track&
 
   Trajectory const & trajectoryBW = trajectories.front();
 
-  vector<Trajectory> && trajectoriesSM = smoother(up, quadrant, sumdy)->trajectories(trajectoryBW);
+  vector<Trajectory> trajectoriesSM = smoother(up, quadrant, sumdy)->trajectories(trajectoryBW);
 
   if(trajectoriesSM.empty()){
     LogTrace(metname)<<"No Track smoothed!"<<endl;
-    return vector<Trajectory>();
   }
 
   return trajectoriesSM;