Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various updates to CMSSW that are not directly related to GPU development (10.1.x) #22108

Merged
merged 1 commit into from Feb 7, 2018
Merged

Various updates to CMSSW that are not directly related to GPU development (10.1.x) #22108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CondFormats/SiPixelObjects/src/SiPixelGainCalibrationOffline.cc
View file
Open in desktop
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/SiPixelDigi/interface/PixelDigi.h
View file
Open in desktop
Expand Up @@ -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);
Expand Down