Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.

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

Hide file tree

Showing 6 changed files with 4 additions and 10 deletions.
diff --git a/RecoBTag/PerformanceDB/plugins/BtagPerformanceESProducer.cc b/RecoBTag/PerformanceDB/plugins/BtagPerformanceESProducer.cc
@@ -31,11 +31,7 @@ BtagPerformanceESProducer::produce(const BTagPerformanceRecord & iRecord){
    ESHandle<PerformanceWorkingPoint> wp;
    iRecord.getRecord<PerformancePayloadRecord>().get(mypl,pl);
 
-   std::cout <<"HERE "<<std::endl;
    iRecord.getRecord<PerformanceWPRecord>().get(mywp,wp);
-   std::cout <<"HERE "<<std::endl;
-
-   std::cout <<" Got the payload, which is a  "<<typeid(*(pl.product())).name()<<std::endl;
 
    //    BtagWorkingPoint wp;
 

diff --git a/RecoCTPPS/PixelLocal/src/RPixDetClusterizer.cc b/RecoCTPPS/PixelLocal/src/RPixDetClusterizer.cc
@@ -4,7 +4,6 @@
 #include "RecoCTPPS/PixelLocal/interface/RPixDetClusterizer.h"
 
 namespace {
-  constexpr int max16bits = 65535;
   constexpr int maxCol = CTPPSPixelCluster::MAXCOL;
   constexpr int maxRow = CTPPSPixelCluster::MAXROW;
   constexpr double highRangeCal = 1800.;

diff --git a/RecoHI/HiCentralityAlgos/plugins/HiTrivialConditionRetriever.cc b/RecoHI/HiCentralityAlgos/plugins/HiTrivialConditionRetriever.cc
@@ -98,7 +98,7 @@ HiTrivialConditionRetriever::produceTable( const HeavyIonRcd& ){
     i++;
   }
 
-  return std::move(CT);
+  return CT;
 }
 
 void HiTrivialConditionRetriever::printBin(const CentralityTable::CBin* thisBin){

diff --git a/RecoTracker/TkNavigation/plugins/SimpleNavigableLayer.cc b/RecoTracker/TkNavigation/plugins/SimpleNavigableLayer.cc
@@ -222,7 +222,7 @@ std::vector< const DetLayer * > SimpleNavigableLayer::compatibleLayers (const Fr
   typedef std::set<const DetLayer *> Lset;  
 
   //initiate the first iteration
-  Lvect && someLayers = nextLayers(fts,timeDirection);
+  const Lvect & someLayers = nextLayers(fts,timeDirection);
   if (someLayers.empty()) {
     LogDebug("SimpleNavigableLayer")  <<"Number of compatible layers: "<< 0;
     return someLayers;

diff --git a/RecoTracker/TransientTrackingRecHit/test/TTRHBuilderTest.cc b/RecoTracker/TransientTrackingRecHit/test/TTRHBuilderTest.cc
@@ -46,8 +46,8 @@ class TTRHBuilderTest : public edm::EDAnalyzer {
 
     edm::ESHandle<TransientTrackingRecHitBuilder> theB;
     setup.get<TransientRecHitRecord>().get(cpeName,theB);
-
-    cout <<" Got a "<<typeid(*theB).name()<<endl;
+    auto& r = *theB; 
+    cout <<" Got a "<<typeid(r).name()<<endl;
     //    cout <<" Strip CPE "<<theB->stripClusterParameterEstimator()<<endl;
     //    cout <<" Pixel CPE "<<theB->pixelClusterParameterEstimator()<<endl;
 

diff --git a/RecoVertex/KinematicFit/src/FinalTreeBuilder.cc b/RecoVertex/KinematicFit/src/FinalTreeBuilder.cc
@@ -153,7 +153,6 @@ AlgebraicMatrix FinalTreeBuilder::momentumPart(const CachingVertex<6>& vtx,
 
  double energy_total = sqrt(par(3)*par(3)+par(6)*par(6) + par(5)*par(5)+par(4)*par(4));
 
- std::vector<KinematicRefittedTrackState *>::const_iterator rs;
  std::vector<RefCountedVertexTrack>::const_iterator rt_i;
  int i_int = 0;
  for(rt_i = refTracks.begin(); rt_i != refTracks.end(); rt_i++)
-Original file line number
+Diff line change
@@ Expand Up @@
         i++;
       }
-      return std::move(CT);
+      return CT;
     }
     void HiTrivialConditionRetriever::printBin(const CentralityTable::CBin* thisBin){
@@ Expand Down @@