Merge pull request #22108 from cms-patatrack/CMSSW_10_1_X_Patatrack_n…

…oGPU Various updates to CMSSW that are not directly related to GPU development (10.1.x)
cms-sw · Feb 7, 2018 · f616a37 · f616a37
2 parents 137e701 + 804affb
commit f616a37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CondFormats/SiPixelObjects/src/SiPixelGainCalibrationOffline.cc b/CondFormats/SiPixelObjects/src/SiPixelGainCalibrationOffline.cc
@@ -188,7 +188,7 @@ float SiPixelGainCalibrationOffline::getGain(const int& col, const int& row, con
   int maxRow = lengthOfColumnData - (lengthOfColumnData % numberOfRowsToAverageOver_) - 1;
   if (col >= nCols || row > maxRow){
     throw cms::Exception("CorruptedData")
-      << "[SiPixelGainCalibrationOffline::getPed] Pixel out of range: col " << col;
+      << "[SiPixelGainCalibrationOffline::getPed] Pixel out of range: col " << col << " row " << row;
   }  
   return decodeGain(s.datum & 0xFF);
 }

diff --git a/DataFormats/SiPixelDigi/interface/PixelDigi.h b/DataFormats/SiPixelDigi/interface/PixelDigi.h
@@ -17,7 +17,7 @@ class PixelDigi {
   typedef unsigned int PackedDigiType;
   typedef unsigned int ChannelType;
 
-  PixelDigi( int packed_value) : theData(packed_value) {}
+  explicit PixelDigi(PackedDigiType packed_value) : theData(packed_value) {}
 
   PixelDigi( int row, int col, int adc) {
     init( row, col, adc);