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

CTPPS Pixel unpacker patch #20120

Merged
merged 3 commits into from Aug 11, 2017
Merged

CTPPS Pixel unpacker patch #20120

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0eb046f
adding patch to prevent corrupted row/col from crashing
fabferro Aug 10, 2017
46d513b
removing extra ;
fabferro Aug 10, 2017
5334e0e
turning magic numbers into constants
fabferro Aug 10, 2017
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
6 changes: 6 additions & 0 deletions EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc
View file
Open in desktop
Expand Up @@ -148,6 +148,12 @@ void CTPPSPixelDataFormatter::interpretRawData( bool& errorsInEvent, int fedId,
int dcol = (ww >> m_DCOL_shift) & m_DCOL_mask;
int pxid = (ww >> m_PXID_shift) & m_PXID_mask;

if(dcol<0||dcol>=26||pxid<2||pxid>161){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are there constants already defined for these ranges 0-25 and 2-160?
If so, please use them instead of the magic numbers.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

edm::LogError("CTPPSPixelDataFormatter")<< " unphysical dcol and/or pxid " << " nllink=" << nlink
<< " nroc="<< nroc << " adc=" << adc << " dcol=" << dcol << " pxid=" << pxid;
continue;
}

std::pair<int,int> rocPixel;
std::pair<int,int> modPixel;

Expand Down