Skip to content
Snippets Groups Projects
Commit 47ea4cb2 authored by Hass AbouZeid's avatar Hass AbouZeid
Browse files

Merge branch '21.0-ATLASRECTS-4063' into '21.0'

Fix of ATLASRECTS-4063 by adding protection against invalid hashId

See merge request !2225
parents ac1737db fa331ff7
No related merge requests found
......@@ -579,6 +579,10 @@ SCT_ByteStreamErrorsSvc::getRODOuts() const {
}
void SCT_ByteStreamErrorsSvc::setFirstTempMaskedChip(const IdentifierHash& hashId, const unsigned int firstTempMaskedChip) {
if(not hashId.is_valid()) {
ATH_MSG_INFO("setFirstTempMaskedChip hashId " << hashId << " is invalid.");
return;
}
if(firstTempMaskedChip==0) {
ATH_MSG_WARNING("setFirstTempMaskedChip: firstTempMaskedChip should be greater than 0. firstTempMaskedChip is " << firstTempMaskedChip);
return;
......
......@@ -204,9 +204,9 @@ SCT_RodDecoder::fillCollection( const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*
*/
/** These are for the trigger */
IdentifierHash skipHash=0xffffffff, lastHash=0xffffffff;
IdentifierHash skipHash, lastHash;
IdentifierHash currentLinkIdHash = 0xffffffff;
IdentifierHash currentLinkIdHash;
memset(saved,0,768*2);
m_errorHit->clear();
......@@ -831,7 +831,7 @@ int SCT_RodDecoder::makeRDO(int strip, int groupSize,int tbin, uint32_t onlineId
}
/** get offlineId from the link number and ROB number */
IdentifierHash idCollHash = m_cabling->getHashFromOnlineId(onlineId) ;
if (idCollHash==0xffffffff) {
if (not idCollHash.is_valid()) {
m_numUnknownOfflineId++;
ATH_MSG_ERROR("Unknown OfflineId for OnlineId -> cannot create RDO");
ATH_MSG_WARNING("Unknown OfflineId for OnlineId "<<std::hex<<onlineId <<" -> cannot create RDO"<<std::dec);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment