Skip to content
Snippets Groups Projects
Commit 086ec2c8 authored by Edward Moyse's avatar Edward Moyse Committed by Graeme Stewart
Browse files

'Attempt to fix ATLASRECTS-3711 - don't do pointless copy' (MuonEventAthenaPool-00-32-06)

	* Attempt to fix ATLASRECTS-3711 - don't do pointless copy
	* MuonEventAthenaPool-00-32-06


Former-commit-id: dcf2a280d0a07e37d705c26ab0bd1d50aa98ee23
parent c6252708
No related branches found
No related tags found
No related merge requests found
...@@ -10,11 +10,17 @@ ...@@ -10,11 +10,17 @@
void void
MdtCsmCnv_p1::persToTrans(const MdtCsm_p1* persColl, MdtCsm* transColl, MsgStream &log) MdtCsmCnv_p1::persToTrans(const MdtCsm_p1* persColl, MdtCsm* transColl, MsgStream &log)
{ {
*transColl = MdtCsm (Identifier(Identifier32(persColl->m_Id)), transColl->m_Id = Identifier(Identifier32(persColl->m_Id));
persColl->m_idHash, transColl->m_idHash = persColl->m_idHash;
persColl->m_SubDetId, transColl->m_SubDetId = persColl->m_SubDetId;
persColl->m_MrodId, transColl->m_MrodId = persColl->m_MrodId;
persColl->m_CsmId); transColl->m_CsmId = persColl->m_CsmId;
// *transColl = MdtCsm (Identifier(Identifier32(persColl->m_Id)),
// persColl->m_idHash,
// persColl->m_SubDetId,
// persColl->m_MrodId,
// persColl->m_CsmId);
// Invoke vector converter from the base template // Invoke vector converter from the base template
MdtCsm_Cnvp1_base_t::persToTrans( persColl, transColl, log ); MdtCsm_Cnvp1_base_t::persToTrans( persColl, transColl, log );
......
...@@ -14,9 +14,9 @@ RpcCoinMatrixCnv_p1::transToPers(const RpcCoinMatrix* transColl, RpcCoinMatrix_p ...@@ -14,9 +14,9 @@ RpcCoinMatrixCnv_p1::transToPers(const RpcCoinMatrix* transColl, RpcCoinMatrix_p
if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << " *** Writing out RpcCoinMatrix" << endmsg; if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << " *** Writing out RpcCoinMatrix" << endmsg;
persColl->m_id = transColl->identify().get_identifier32().get_compact(); persColl->m_id = transColl->identify().get_identifier32().get_compact();
persColl->m_onlineId = transColl->onlineId(); persColl->m_onlineId = transColl->onlineId();
persColl->m_crc = transColl->crc(); persColl->m_crc = transColl->crc();
persColl->m_fel1Id = transColl->fel1Id(); persColl->m_fel1Id = transColl->fel1Id();
persColl->m_febcId = transColl->febcId(); persColl->m_febcId = transColl->febcId();
// Invoke vector converter from the base template // Invoke vector converter from the base template
...@@ -28,11 +28,11 @@ RpcCoinMatrixCnv_p1::persToTrans(const RpcCoinMatrix_p1* persColl, RpcCoinMatrix ...@@ -28,11 +28,11 @@ RpcCoinMatrixCnv_p1::persToTrans(const RpcCoinMatrix_p1* persColl, RpcCoinMatrix
{ {
if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << " *** Reading RpcCoinMatrix" << endmsg; if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << " *** Reading RpcCoinMatrix" << endmsg;
*transColl = RpcCoinMatrix (Identifier(Identifier32(persColl->m_id)), transColl->m_id = Identifier(Identifier32(persColl->m_id));
persColl->m_onlineId, transColl->m_onlineId = persColl->m_onlineId;
persColl->m_crc, transColl->m_crc = persColl->m_crc;
persColl->m_fel1Id, transColl->m_fel1Id = persColl->m_fel1Id;
persColl->m_febcId); transColl->m_febcId = persColl->m_febcId;
// Invoke vector converter from the base template // Invoke vector converter from the base template
RpcCoinMatrixCnv_p1_basetype::persToTrans( persColl, transColl, log ); RpcCoinMatrixCnv_p1_basetype::persToTrans( persColl, transColl, log );
......
...@@ -27,12 +27,13 @@ RpcPadCnv_p1::transToPers(const RpcPad* transColl, RpcPad_p1* persColl, MsgStrea ...@@ -27,12 +27,13 @@ RpcPadCnv_p1::transToPers(const RpcPad* transColl, RpcPad_p1* persColl, MsgStrea
void void
RpcPadCnv_p1::persToTrans(const RpcPad_p1* persColl, RpcPad* transColl, MsgStream &log) RpcPadCnv_p1::persToTrans(const RpcPad_p1* persColl, RpcPad* transColl, MsgStream &log)
{ {
*transColl = RpcPad (Identifier(Identifier32(persColl->m_id)), // std::cout<<"RpcPadCnv_p1::persToTrans with transColl="<<transColl<<std::endl;
persColl->m_idHash, transColl->m_id = Identifier(Identifier32(persColl->m_id));
persColl->m_onlineId, transColl->m_idHash = persColl->m_idHash;
persColl->m_status, transColl->m_onlineId = persColl->m_onlineId;
persColl->m_errorCode, transColl->m_status = persColl->m_status;
persColl->m_sector); transColl->m_errorCode = persColl->m_errorCode;
transColl->m_sector = persColl->m_sector;
// Invoke vector converter from the base template // Invoke vector converter from the base template
RpcPadCnv_p1_basetype::persToTrans( persColl, transColl, log ); RpcPadCnv_p1_basetype::persToTrans( persColl, transColl, log );
......
...@@ -112,7 +112,6 @@ void RpcPadContainerCnv_p2::persToTrans(const RpcPadContainer_p2* persCont, Rpc ...@@ -112,7 +112,6 @@ void RpcPadContainerCnv_p2::persToTrans(const RpcPadContainer_p2* persCont, Rpc
} }
} }
} }
log << MSG::DEBUG << " *** Reading RpcPadContainer" << endmsg; log << MSG::DEBUG << " *** Reading RpcPadContainer" << endmsg;
} }
......
...@@ -10,21 +10,38 @@ void TgcRawDataCnv_p2::persToTrans(const TgcRawData_p2* persObj, ...@@ -10,21 +10,38 @@ void TgcRawDataCnv_p2::persToTrans(const TgcRawData_p2* persObj,
TgcRawData* transObj, TgcRawData* transObj,
MsgStream &/*log*/) MsgStream &/*log*/)
{ {
*transObj = TgcRawData (persObj->m_bcTag,
persObj->m_subDetectorId, transObj-> m_bcTag = persObj->m_bcTag;
persObj->m_rodId, transObj-> m_subDetectorId = persObj->m_subDetectorId;
persObj->m_l1Id, transObj-> m_rodId = persObj->m_rodId;
persObj->m_bcId, transObj-> m_l1Id = persObj->m_l1Id;
persObj->m_strip, transObj-> m_bcId = persObj->m_bcId;
persObj->m_forward, transObj-> m_strip = persObj->m_strip;
persObj->m_sector, transObj-> m_forward = persObj->m_forward;
persObj->m_chip, transObj-> m_sector = persObj->m_sector;
persObj->m_index, transObj-> m_chip = persObj->m_chip;
persObj->m_hipt, transObj-> m_index = persObj->m_index;
persObj->m_hitId, transObj-> m_hipt = persObj->m_hipt;
persObj->m_hsub, transObj-> m_hitId = persObj->m_hitId;
persObj->m_delta, transObj-> m_hsub = persObj->m_hsub;
0); transObj-> m_delta = persObj->m_delta;
transObj-> m_inner = 0;
// m_inner
// *transObj = TgcRawData (persObj->m_bcTag,
// persObj->m_subDetectorId,
// persObj->m_rodId,
// persObj->m_l1Id,
// persObj->m_bcId,
// persObj->m_strip,
// persObj->m_forward,
// persObj->m_sector,
// persObj->m_chip,
// persObj->m_index,
// persObj->m_hipt,
// persObj->m_hitId,
// persObj->m_hsub,
// persObj->m_delta,
// 0);
transObj->m_sswId = persObj->m_sswId; transObj->m_sswId = persObj->m_sswId;
transObj->m_slbId = persObj->m_slbId; transObj->m_slbId = persObj->m_slbId;
......
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