Skip to content
Snippets Groups Projects
Commit e920faa3 authored by Julien Maurer's avatar Julien Maurer
Browse files

Merge branch 'ATLASRECTS-7267' into '22.0'

NSW Prepdata persitification - Remove RDO warning

See merge request !57019
parents 73c7babc 0b990a4c
No related branches found
No related tags found
4 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!5707927.09.2022: daily merge merge of 22.0 into master,!57019NSW Prepdata persitification - Remove RDO warning
......@@ -62,7 +62,7 @@ persToTrans( const Muon::MMPrepData_p1 *persObj, Muon::MMPrepData *transObj,MsgS
}
void MMPrepDataCnv_p1::
transToPers( const Muon::MMPrepData *transObj, Muon::MMPrepData_p1 *persObj, MsgStream & log )
transToPers( const Muon::MMPrepData *transObj, Muon::MMPrepData_p1 *persObj, MsgStream &)
{
persObj->m_locX = transObj->localPosition()[Trk::locX];
persObj->m_errorMat = (transObj->localCovariance())(0,0);
......@@ -93,7 +93,6 @@ transToPers( const Muon::MMPrepData *transObj, Muon::MMPrepData_p1 *persObj, Msg
// (this only works if the absolute value of the difference is smaller than 128)
Identifier32::value_type rdoIdCompact = rdo_id.get_identifier32().get_compact(); // unsigned int
int diff = (int)(rdoIdCompact-clusIdCompact);
if (abs(diff)>SCHAR_MAX) log << MSG::WARNING << "Difference between cluster and rdo Identifier (" << diff << ") larger than what can be stored (" << SCHAR_MAX << ")" << endmsg;
rdoListPers.push_back((signed char)diff);
}
......
......@@ -60,7 +60,7 @@ persToTrans( const Muon::sTgcPrepData_p1 *persObj, Muon::sTgcPrepData *transObj,
}
void sTgcPrepDataCnv_p1::
transToPers( const Muon::sTgcPrepData *transObj, Muon::sTgcPrepData_p1 *persObj, MsgStream & log )
transToPers( const Muon::sTgcPrepData *transObj, Muon::sTgcPrepData_p1 *persObj, MsgStream & )
{
//log << MSG::DEBUG << "sTgcPrepDataCnv_p1::transToPers" << endmsg;
persObj->m_locX = transObj->localPosition()[Trk::locX];
......@@ -84,7 +84,6 @@ transToPers( const Muon::sTgcPrepData *transObj, Muon::sTgcPrepData_p1 *persObj,
// (this only works if the absolute value of the difference is smaller than 128)
Identifier32::value_type rdoIdCompact = rdo_id.get_identifier32().get_compact(); // unsigned int
int diff = (int)(rdoIdCompact-clusIdCompact);
if (abs(diff)>SCHAR_MAX) log << MSG::WARNING << "Difference between cluster and rdo Identifier (" << diff << ") larger than what can be stored (" << SCHAR_MAX << ")" << endmsg;
rdoListPers.push_back((signed char)diff);
}
......
......@@ -59,7 +59,7 @@ persToTrans( const Muon::sTgcPrepData_p2 *persObj, Muon::sTgcPrepData *transObj,
}
void sTgcPrepDataCnv_p2::
transToPers( const Muon::sTgcPrepData *transObj, Muon::sTgcPrepData_p2 *persObj, MsgStream & log )
transToPers( const Muon::sTgcPrepData *transObj, Muon::sTgcPrepData_p2 *persObj, MsgStream & )
{
persObj->m_locX = transObj->localPosition()[Trk::locX];
persObj->m_locY = transObj->localPosition()[Trk::locY];
......@@ -83,7 +83,6 @@ transToPers( const Muon::sTgcPrepData *transObj, Muon::sTgcPrepData_p2 *persObj,
// (this only works if the absolute value of the difference is smaller than 128)
Identifier32::value_type rdoIdCompact = rdo_id.get_identifier32().get_compact(); // unsigned int
int diff = (int)(rdoIdCompact-clusIdCompact);
if (abs(diff)>SCHAR_MAX) log << MSG::WARNING << "Difference between cluster and rdo Identifier (" << diff << ") larger than what can be stored (" << SCHAR_MAX << ")" << endmsg;
rdoListPers.push_back((signed char)diff);
}
......
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