diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCnv_p1.cxx
index 4abb90b7bdeec28b7150c44302e8b7bf673fb7b8..58881adccdfc42e9eaf150c385ac35ef8f4b547d 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMCPHitsCnv_p1.cxx
@@ -23,7 +23,7 @@ CMMCPHitsCnv_p1::CMMCPHitsCnv_p1()
void CMMCPHitsCnv_p1::persToTrans( const CMMCPHits_p1* persObj, CMMCPHits* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMMCPHits from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMMCPHits from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -38,7 +38,7 @@ void CMMCPHitsCnv_p1::persToTrans( const CMMCPHits_p1* persObj, CMMCPHits* trans
persObj->m_error1,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMMCPHits from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMMCPHits from persistent state [OK]" << endmsg;
return;
@@ -46,7 +46,7 @@ void CMMCPHitsCnv_p1::persToTrans( const CMMCPHits_p1* persObj, CMMCPHits* trans
void CMMCPHitsCnv_p1::transToPers( const CMMCPHits* transObj, CMMCPHits_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMMCPHits..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMMCPHits..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_dataID = transObj->dataID();
@@ -56,7 +56,7 @@ void CMMCPHitsCnv_p1::transToPers( const CMMCPHits* transObj, CMMCPHits_p1* pers
persObj->m_error0 = transObj->ErrorVec0();
persObj->m_error1 = transObj->ErrorVec1();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMMCPHits [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMMCPHits [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCnv_p1.cxx
index 4dcc219efbc25aa2f46c8e1a1af2b4ec8a52a3ba..8b59b5be7d0f93ef6995d9f6c638869bd953fa33 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMEtSumsCnv_p1.cxx
@@ -23,7 +23,7 @@ CMMEtSumsCnv_p1::CMMEtSumsCnv_p1()
void CMMEtSumsCnv_p1::persToTrans( const CMMEtSums_p1* persObj, CMMEtSums* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMMEtSums from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMMEtSums from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -40,7 +40,7 @@ void CMMEtSumsCnv_p1::persToTrans( const CMMEtSums_p1* persObj, CMMEtSums* trans
persObj->m_EyError,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMMEtSums from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMMEtSums from persistent state [OK]" << endmsg;
return;
@@ -48,7 +48,7 @@ void CMMEtSumsCnv_p1::persToTrans( const CMMEtSums_p1* persObj, CMMEtSums* trans
void CMMEtSumsCnv_p1::transToPers( const CMMEtSums* transObj, CMMEtSums_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMMEtSums..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMMEtSums..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_dataID = transObj->dataID();
@@ -60,7 +60,7 @@ void CMMEtSumsCnv_p1::transToPers( const CMMEtSums* transObj, CMMEtSums_p1* pers
persObj->m_EyError = transObj->EyErrorVec();
persObj->m_peak = transObj->peak();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMMEtSums [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMMEtSums [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCnv_p1.cxx
index 268a736963e13b4d7ec76df8128f9d12c5394ed3..0efe4c3d16b250b160abbf2657593ba040eafa8a 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMJetHitsCnv_p1.cxx
@@ -22,7 +22,7 @@ CMMJetHitsCnv_p1::CMMJetHitsCnv_p1()
void CMMJetHitsCnv_p1::persToTrans( const CMMJetHits_p1* persObj, CMMJetHits* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMMJetHits from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMMJetHits from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -35,7 +35,7 @@ void CMMJetHitsCnv_p1::persToTrans( const CMMJetHits_p1* persObj, CMMJetHits* tr
persObj->m_errors,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMMJetHits from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMMJetHits from persistent state [OK]" << endmsg;
return;
@@ -43,7 +43,7 @@ void CMMJetHitsCnv_p1::persToTrans( const CMMJetHits_p1* persObj, CMMJetHits* tr
void CMMJetHitsCnv_p1::transToPers( const CMMJetHits* transObj, CMMJetHits_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMMJetHits..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMMJetHits..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_dataID = transObj->dataID();
@@ -51,7 +51,7 @@ void CMMJetHitsCnv_p1::transToPers( const CMMJetHits* transObj, CMMJetHits_p1* p
persObj->m_hits = transObj->HitsVec();
persObj->m_errors = transObj->ErrorVec();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMMJetHits [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMMJetHits [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMRoICnv_p1.cxx
index ce7f2344f1f415fd24c8ec9becaf08ad812c028a..dbb00b7614f5b56da8600383a4203d2bb31a957d 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMMRoICnv_p1.cxx
@@ -23,7 +23,7 @@ CMMRoICnv_p1::CMMRoICnv_p1()
void CMMRoICnv_p1::persToTrans( const CMMRoI_p1* persObj, CMMRoI* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMMRoI from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMMRoI from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -35,7 +35,7 @@ void CMMRoICnv_p1::persToTrans( const CMMRoI_p1* persObj, CMMRoI* transObj, MsgS
persObj->m_energyRoiWord1,
persObj->m_energyRoiWord2);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMMRoI from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMMRoI from persistent state [OK]" << endmsg;
return;
@@ -43,14 +43,14 @@ void CMMRoICnv_p1::persToTrans( const CMMRoI_p1* persObj, CMMRoI* transObj, MsgS
void CMMRoICnv_p1::transToPers( const CMMRoI* transObj, CMMRoI_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMMRoI..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMMRoI..." << endmsg;
persObj->m_jetEtRoiWord = transObj->jetEtRoiWord();
persObj->m_energyRoiWord0 = transObj->energyRoiWord0();
persObj->m_energyRoiWord1 = transObj->energyRoiWord1();
persObj->m_energyRoiWord2 = transObj->energyRoiWord2();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMMRoI [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMMRoI [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCnv_p1.cxx
index 78aec6cf599285c5dac5339c5e361acfb902689d..7b8425de53a6884fb09ed8c94e66f754cb2a98b1 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPHitsCnv_p1.cxx
@@ -23,7 +23,7 @@ CMXCPHitsCnv_p1::CMXCPHitsCnv_p1()
void CMXCPHitsCnv_p1::persToTrans( const CMXCPHits_p1* persObj, CMXCPHits* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMXCPHits from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMXCPHits from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -39,7 +39,7 @@ void CMXCPHitsCnv_p1::persToTrans( const CMXCPHits_p1* persObj, CMXCPHits* trans
persObj->m_error1,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXCPHits from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXCPHits from persistent state [OK]" << endmsg;
return;
@@ -47,7 +47,7 @@ void CMXCPHitsCnv_p1::persToTrans( const CMXCPHits_p1* persObj, CMXCPHits* trans
void CMXCPHitsCnv_p1::transToPers( const CMXCPHits* transObj, CMXCPHits_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMXCPHits..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMXCPHits..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_cmx = transObj->cmx();
@@ -58,7 +58,7 @@ void CMXCPHitsCnv_p1::transToPers( const CMXCPHits* transObj, CMXCPHits_p1* pers
persObj->m_error0 = transObj->errorVec0();
persObj->m_error1 = transObj->errorVec1();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXCPHits [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXCPHits [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCnv_p1.cxx
index 7d58f6ecf22d36600afb92a9ce57cb2180b2dedf..ed502e2340e5a647e00fdd21279de68fc379e135 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXCPTobCnv_p1.cxx
@@ -23,7 +23,7 @@ CMXCPTobCnv_p1::CMXCPTobCnv_p1()
void CMXCPTobCnv_p1::persToTrans( const CMXCPTob_p1* persObj, CMXCPTob* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMXCPTob from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMXCPTob from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -41,7 +41,7 @@ void CMXCPTobCnv_p1::persToTrans( const CMXCPTob_p1* persObj, CMXCPTob* transObj
persObj->m_presenceMap,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXCPTob from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXCPTob from persistent state [OK]" << endmsg;
return;
@@ -49,7 +49,7 @@ void CMXCPTobCnv_p1::persToTrans( const CMXCPTob_p1* persObj, CMXCPTob* transObj
void CMXCPTobCnv_p1::transToPers( const CMXCPTob* transObj, CMXCPTob_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMXCPTob..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMXCPTob..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_cmx = transObj->cmx();
@@ -62,7 +62,7 @@ void CMXCPTobCnv_p1::transToPers( const CMXCPTob* transObj, CMXCPTob_p1* persObj
persObj->m_error = transObj->errorVec();
persObj->m_presenceMap = transObj->presenceMapVec();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXCPTob [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXCPTob [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCnv_p1.cxx
index 00d67b3feceef9cb848c9cf59a8732c1483d633e..2365cce2b1f9e7361ef6385cbb5fd45414d702d3 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXEtSumsCnv_p1.cxx
@@ -23,7 +23,7 @@ CMXEtSumsCnv_p1::CMXEtSumsCnv_p1()
void CMXEtSumsCnv_p1::persToTrans( const CMXEtSums_p1* persObj, CMXEtSums* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMXEtSums from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMXEtSums from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -40,7 +40,7 @@ void CMXEtSumsCnv_p1::persToTrans( const CMXEtSums_p1* persObj, CMXEtSums* trans
persObj->m_EyError,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXEtSums from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXEtSums from persistent state [OK]" << endmsg;
return;
@@ -48,7 +48,7 @@ void CMXEtSumsCnv_p1::persToTrans( const CMXEtSums_p1* persObj, CMXEtSums* trans
void CMXEtSumsCnv_p1::transToPers( const CMXEtSums* transObj, CMXEtSums_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMXEtSums..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMXEtSums..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_source = transObj->source();
@@ -60,7 +60,7 @@ void CMXEtSumsCnv_p1::transToPers( const CMXEtSums* transObj, CMXEtSums_p1* pers
persObj->m_ExError = transObj->ExErrorVec();
persObj->m_EyError = transObj->EyErrorVec();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXEtSums [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXEtSums [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCnv_p1.cxx
index 9a90609f85a0192e4397664a48e6c38d43513f56..545aa41dedb689469c3151bf9952f9efe5913526 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetHitsCnv_p1.cxx
@@ -23,7 +23,7 @@ CMXJetHitsCnv_p1::CMXJetHitsCnv_p1()
void CMXJetHitsCnv_p1::persToTrans( const CMXJetHits_p1* persObj, CMXJetHits* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMXJetHits from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMXJetHits from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -38,7 +38,7 @@ void CMXJetHitsCnv_p1::persToTrans( const CMXJetHits_p1* persObj, CMXJetHits* tr
persObj->m_error1,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXJetHits from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXJetHits from persistent state [OK]" << endmsg;
return;
@@ -46,7 +46,7 @@ void CMXJetHitsCnv_p1::persToTrans( const CMXJetHits_p1* persObj, CMXJetHits* tr
void CMXJetHitsCnv_p1::transToPers( const CMXJetHits* transObj, CMXJetHits_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMXJetHits..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMXJetHits..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_source = transObj->source();
@@ -56,7 +56,7 @@ void CMXJetHitsCnv_p1::transToPers( const CMXJetHits* transObj, CMXJetHits_p1* p
persObj->m_error0 = transObj->errorVec0();
persObj->m_error1 = transObj->errorVec1();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXJetHits [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXJetHits [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCnv_p1.cxx
index ef1e27dffe6e5f09c940597864e67b9f8cfd39b2..6e217eecbaedc94a0b1a975e32a24e12a8eedae6 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXJetTobCnv_p1.cxx
@@ -23,7 +23,7 @@ CMXJetTobCnv_p1::CMXJetTobCnv_p1()
void CMXJetTobCnv_p1::persToTrans( const CMXJetTob_p1* persObj, CMXJetTob* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMXJetTob from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMXJetTob from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -40,7 +40,7 @@ void CMXJetTobCnv_p1::persToTrans( const CMXJetTob_p1* persObj, CMXJetTob* trans
persObj->m_presenceMap,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXJetTob from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXJetTob from persistent state [OK]" << endmsg;
return;
@@ -48,7 +48,7 @@ void CMXJetTobCnv_p1::persToTrans( const CMXJetTob_p1* persObj, CMXJetTob* trans
void CMXJetTobCnv_p1::transToPers( const CMXJetTob* transObj, CMXJetTob_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMXJetTob..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMXJetTob..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_jem = transObj->jem();
@@ -60,7 +60,7 @@ void CMXJetTobCnv_p1::transToPers( const CMXJetTob* transObj, CMXJetTob_p1* pers
persObj->m_error = transObj->errorVec();
persObj->m_presenceMap = transObj->presenceMapVec();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXJetTob [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXJetTob [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXRoICnv_p1.cxx
index 5b0f65bdd93adfd039e96d73e5aeb4aaabc43c02..4afd032b3de118879479faae549f990f4a6a89eb 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CMXRoICnv_p1.cxx
@@ -23,7 +23,7 @@ CMXRoICnv_p1::CMXRoICnv_p1()
void CMXRoICnv_p1::persToTrans( const CMXRoI_p1* persObj, CMXRoI* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CMXRoI from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CMXRoI from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -37,7 +37,7 @@ void CMXRoICnv_p1::persToTrans( const CMXRoI_p1* persObj, CMXRoI* transObj, MsgS
persObj->m_roiWords[4],
persObj->m_roiWords[5]);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXRoI from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CMXRoI from persistent state [OK]" << endmsg;
return;
@@ -45,13 +45,13 @@ void CMXRoICnv_p1::persToTrans( const CMXRoI_p1* persObj, CMXRoI* transObj, MsgS
void CMXRoICnv_p1::transToPers( const CMXRoI* transObj, CMXRoI_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CMXRoI..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CMXRoI..." << endmsg;
persObj->m_roiWords.resize(6);
for (int i=0; i < 6; i++)
persObj->m_roiWords[i] = transObj->roiWord(i);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXRoI [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CMXRoI [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCnv_p1.cxx
index 5ea70c5fd9fc4bdc14c8d92242d604652878b12b..009fa7e68544900d96581665bd5d9d51c51d47b3 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMHitsCnv_p1.cxx
@@ -23,7 +23,7 @@ CPMHitsCnv_p1::CPMHitsCnv_p1()
void CPMHitsCnv_p1::persToTrans( const CPMHits_p1* persObj, CPMHits* transObj, MsgStream &log ) {
- //log << MSG::DEBUG << "Converting CPMHits from persistent state..." << endreq;
+ //log << MSG::DEBUG << "Converting CPMHits from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -36,7 +36,7 @@ void CPMHitsCnv_p1::persToTrans( const CPMHits_p1* persObj, CPMHits* transObj, M
persObj->m_Hits1,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CPMHits from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CPMHits from persistent state [OK]" << endmsg;
return;
@@ -44,7 +44,7 @@ void CPMHitsCnv_p1::persToTrans( const CPMHits_p1* persObj, CPMHits* transObj, M
void CPMHitsCnv_p1::transToPers( const CPMHits* transObj, CPMHits_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CPMHits..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CPMHits..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_module = transObj->module();
@@ -52,7 +52,7 @@ void CPMHitsCnv_p1::transToPers( const CPMHits* transObj, CPMHits_p1* persObj, M
persObj->m_Hits0 = transObj->HitsVec0();
persObj->m_Hits1 = transObj->HitsVec1();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CPMHits [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CPMHits [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICnv_p1.cxx
index 207231e2f7f9dd13f2d9d385f7b858f1ae0c048b..8a68ddfb1b05c97cb288cbda0c838c3e36b4a2c1 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMRoICnv_p1.cxx
@@ -23,7 +23,7 @@ CPMRoICnv_p1::CPMRoICnv_p1()
void CPMRoICnv_p1::persToTrans( const CPMRoI_p1* persObj, CPMRoI* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CPMRoI from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CPMRoI from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -32,7 +32,7 @@ void CPMRoICnv_p1::persToTrans( const CPMRoI_p1* persObj, CPMRoI* transObj, MsgS
//
*transObj = CPMRoI (persObj->m_roiWord);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CPMRoI from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CPMRoI from persistent state [OK]" << endmsg;
return;
@@ -40,11 +40,11 @@ void CPMRoICnv_p1::persToTrans( const CPMRoI_p1* persObj, CPMRoI* transObj, MsgS
void CPMRoICnv_p1::transToPers( const CPMRoI* transObj, CPMRoI_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CPMRoI..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CPMRoI..." << endmsg;
persObj->m_roiWord = transObj->roiWord();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CPMRoI [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CPMRoI [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICnv_p1.cxx
index a7fd451e0ce000ff3e48d73fedbafedb75c7146e..62150031ba5cc4f84303750a51bde71b90fee4d8 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTobRoICnv_p1.cxx
@@ -23,7 +23,7 @@ CPMTobRoICnv_p1::CPMTobRoICnv_p1()
void CPMTobRoICnv_p1::persToTrans( const CPMTobRoI_p1* persObj, CPMTobRoI* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CPMTobRoI from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CPMTobRoI from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -32,7 +32,7 @@ void CPMTobRoICnv_p1::persToTrans( const CPMTobRoI_p1* persObj, CPMTobRoI* trans
//
*transObj = CPMTobRoI (persObj->m_roiWord);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CPMTobRoI from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CPMTobRoI from persistent state [OK]" << endmsg;
return;
@@ -40,11 +40,11 @@ void CPMTobRoICnv_p1::persToTrans( const CPMTobRoI_p1* persObj, CPMTobRoI* trans
void CPMTobRoICnv_p1::transToPers( const CPMTobRoI* transObj, CPMTobRoI_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CPMTobRoI..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CPMTobRoI..." << endmsg;
persObj->m_roiWord = transObj->roiWord();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CPMTobRoI [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CPMTobRoI [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCnv_p1.cxx
index 93ff36ad5327b77b1b8132b50c89b4dd8324f708..b5942e2a3d346648c2097ca91ffa4f582dd01e7a 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CPMTowerCnv_p1.cxx
@@ -22,7 +22,7 @@ CPMTowerCnv_p1::CPMTowerCnv_p1()
void CPMTowerCnv_p1::persToTrans( const CPMTower_p1* persObj, CPMTower* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting CPMTower from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting CPMTower from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -37,7 +37,7 @@ void CPMTowerCnv_p1::persToTrans( const CPMTower_p1* persObj, CPMTower* transObj
persObj->m_had_error,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CPMTower from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted CPMTower from persistent state [OK]" << endmsg;
return;
@@ -45,7 +45,7 @@ void CPMTowerCnv_p1::persToTrans( const CPMTower_p1* persObj, CPMTower* transObj
void CPMTowerCnv_p1::transToPers( const CPMTower* transObj, CPMTower_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of CPMTower..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of CPMTower..." << endmsg;
persObj->m_phi = transObj->phi();
persObj->m_eta = transObj->eta();
@@ -56,7 +56,7 @@ void CPMTowerCnv_p1::transToPers( const CPMTower* transObj, CPMTower_p1* persObj
persObj->m_em_error = transObj->emErrorVec();
persObj->m_had_error = transObj->hadErrorVec();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CPMTower [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of CPMTower [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p1.cxx
index ada97c7e44c8e6443660c5093e95b2d9e3ac7e60..f2feb842847167cfe23eb261044dd8f2f2ba462f 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p1.cxx
@@ -24,11 +24,11 @@ CTP_RDOCnv_p1::CTP_RDOCnv_p1()
void CTP_RDOCnv_p1::persToTrans( const CTP_RDO_p1* persObj, CTP_RDO* transObj,
MsgStream& log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting CTP_RDO from persistent state..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting CTP_RDO from persistent state..." << endmsg;
*transObj = CTP_RDO (0, persObj->m_dataWords);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting CTP_RDO from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting CTP_RDO from persistent state [OK]" << endmsg;
return;
@@ -41,7 +41,7 @@ void CTP_RDOCnv_p1::persToTrans( const CTP_RDO_p1* persObj, CTP_RDO* transObj,
void CTP_RDOCnv_p1::transToPers( const CTP_RDO* transObj, CTP_RDO_p1* persObj,
MsgStream& log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of CTP_RDO..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of CTP_RDO..." << endmsg;
// not needed, will be recalculated
// persObj->m_numberOfBunches = transObj->m_numberOfBunches;
@@ -50,7 +50,7 @@ void CTP_RDOCnv_p1::transToPers( const CTP_RDO* transObj, CTP_RDO_p1* persObj,
persObj->m_dataWords = transObj->getDataWords();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of CTP_RDO [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of CTP_RDO [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p2.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p2.cxx
index 6fddedbf3a36c691485135997427cc9bf5c405ad..9da284fe7cc83e1a4a849e95589e448f1461a06c 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p2.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/CTP_RDOCnv_p2.cxx
@@ -24,12 +24,12 @@ CTP_RDOCnv_p2::CTP_RDOCnv_p2()
void CTP_RDOCnv_p2::persToTrans( const CTP_RDO_p2* persObj, CTP_RDO* transObj,
MsgStream& log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting CTP_RDO from persistent state..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting CTP_RDO from persistent state..." << endmsg;
*transObj = CTP_RDO (0, persObj->m_dataWords);
transObj->setL1AcceptBunchPosition (persObj->m_l1AcceptPosition);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting CTP_RDO from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting CTP_RDO from persistent state [OK]" << endmsg;
return;
@@ -42,7 +42,7 @@ void CTP_RDOCnv_p2::persToTrans( const CTP_RDO_p2* persObj, CTP_RDO* transObj,
void CTP_RDOCnv_p2::transToPers( const CTP_RDO* transObj, CTP_RDO_p2* persObj,
MsgStream& log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of CTP_RDO..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of CTP_RDO..." << endmsg;
// not needed, will be recalculated
// persObj->m_numberOfBunches = transObj->m_numberOfBunches;
@@ -52,7 +52,7 @@ void CTP_RDOCnv_p2::transToPers( const CTP_RDO* transObj, CTP_RDO_p2* persObj,
persObj->m_l1AcceptPosition = transObj->getL1AcceptBunchPosition();
persObj->m_dataWords = transObj->getDataWords();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of CTP_RDO [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of CTP_RDO [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCnv_p1.cxx
index bf4470da9d277e6e78b33f8592297905d8372bb3..a697b1da549db42ea3d46568237d9d153c4414a6 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMEtSumsCnv_p1.cxx
@@ -23,7 +23,7 @@ JEMEtSumCnv_p1::JEMEtSumCnv_p1()
void JEMEtSumsCnv_p1::persToTrans( const JEMEtSums_p1* persObj, JEMEtSums* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting JEMEtSum from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting JEMEtSum from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -37,7 +37,7 @@ void JEMEtSumsCnv_p1::persToTrans( const JEMEtSums_p1* persObj, JEMEtSums* trans
persObj->m_Ey,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JEMEtSum from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JEMEtSum from persistent state [OK]" << endmsg;
return;
@@ -45,7 +45,7 @@ void JEMEtSumsCnv_p1::persToTrans( const JEMEtSums_p1* persObj, JEMEtSums* trans
void JEMEtSumsCnv_p1::transToPers( const JEMEtSums* transObj, JEMEtSums_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of JEMEtSum..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of JEMEtSum..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_module = transObj->module();
@@ -54,7 +54,7 @@ void JEMEtSumsCnv_p1::transToPers( const JEMEtSums* transObj, JEMEtSums_p1* pers
persObj->m_Ex = transObj->ExVec();
persObj->m_Ey = transObj->EyVec();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JEMEtSum [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JEMEtSum [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCnv_p1.cxx
index 60c1590adf9c4bca3003a73cec3497d214d15b80..835b875f0592d18d438c02e52662dadf31d54cac 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMHitsCnv_p1.cxx
@@ -23,7 +23,7 @@ JEMHitsCnv_p1::JEMHitsCnv_p1()
void JEMHitsCnv_p1::persToTrans( const JEMHits_p1* persObj, JEMHits* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting JEMHits from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting JEMHits from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -35,7 +35,7 @@ void JEMHitsCnv_p1::persToTrans( const JEMHits_p1* persObj, JEMHits* transObj, M
persObj->m_JetHits,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JEMHits from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JEMHits from persistent state [OK]" << endmsg;
return;
@@ -43,14 +43,14 @@ void JEMHitsCnv_p1::persToTrans( const JEMHits_p1* persObj, JEMHits* transObj, M
void JEMHitsCnv_p1::transToPers( const JEMHits* transObj, JEMHits_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of JEMHits..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of JEMHits..." << endmsg;
persObj->m_crate = transObj->crate();
persObj->m_module = transObj->module();
persObj->m_peak = transObj->peak();
persObj->m_JetHits = transObj->JetHitsVec();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JEMHits [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JEMHits [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICnv_p1.cxx
index 73191b387291caafc0823d15c1da9acc5f210575..aa7b78a531d3cf095da9db5b53152b15c6a5ce89 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMRoICnv_p1.cxx
@@ -23,7 +23,7 @@ JEMRoICnv_p1::JEMRoICnv_p1()
void JEMRoICnv_p1::persToTrans( const JEMRoI_p1* persObj, JEMRoI* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting JEMRoI from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting JEMRoI from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -32,7 +32,7 @@ void JEMRoICnv_p1::persToTrans( const JEMRoI_p1* persObj, JEMRoI* transObj, MsgS
//
*transObj = JEMRoI (persObj->m_roiWord);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JEMRoI from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JEMRoI from persistent state [OK]" << endmsg;
return;
@@ -40,11 +40,11 @@ void JEMRoICnv_p1::persToTrans( const JEMRoI_p1* persObj, JEMRoI* transObj, MsgS
void JEMRoICnv_p1::transToPers( const JEMRoI* transObj, JEMRoI_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of JEMRoI..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of JEMRoI..." << endmsg;
persObj->m_roiWord = transObj->roiWord();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JEMRoI [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JEMRoI [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICnv_p1.cxx
index 11192ca7fcee8b00aec48039875bb28220ec182c..933ac3c8c87df02b612a6009fe0c6d27de21eac4 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JEMTobRoICnv_p1.cxx
@@ -23,7 +23,7 @@ JEMTobRoICnv_p1::JEMTobRoICnv_p1()
void JEMTobRoICnv_p1::persToTrans( const JEMTobRoI_p1* persObj, JEMTobRoI* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting JEMTobRoI from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting JEMTobRoI from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -32,7 +32,7 @@ void JEMTobRoICnv_p1::persToTrans( const JEMTobRoI_p1* persObj, JEMTobRoI* trans
//
*transObj = JEMTobRoI (persObj->m_roiWord);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JEMTobRoI from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JEMTobRoI from persistent state [OK]" << endmsg;
return;
@@ -40,11 +40,11 @@ void JEMTobRoICnv_p1::persToTrans( const JEMTobRoI_p1* persObj, JEMTobRoI* trans
void JEMTobRoICnv_p1::transToPers( const JEMTobRoI* transObj, JEMTobRoI_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of JEMTobRoI..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of JEMTobRoI..." << endmsg;
persObj->m_roiWord = transObj->roiWord();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JEMTobRoI [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JEMTobRoI [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCnv_p1.cxx
index d524a3e76efae68b38a18800738c86dc0a973bf6..52c4c1e53e5f8ca34fef05620bfeb039b23d64fc 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/JetElementCnv_p1.cxx
@@ -22,7 +22,7 @@ JetElementCnv_p1::JetElementCnv_p1()
void JetElementCnv_p1::persToTrans( const JetElement_p1* persObj, JetElement* transObj, MsgStream &log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting JetElement from persistent state..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting JetElement from persistent state..." << endmsg;
//
// Translate the JetElement
@@ -37,7 +37,7 @@ void JetElementCnv_p1::persToTrans( const JetElement_p1* persObj, JetElement* tr
persObj->m_link_error,
persObj->m_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JetElement from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted JetElement from persistent state [OK]" << endmsg;
return;
@@ -45,7 +45,7 @@ void JetElementCnv_p1::persToTrans( const JetElement_p1* persObj, JetElement* tr
void JetElementCnv_p1::transToPers( const JetElement* transObj, JetElement_p1* persObj, MsgStream &log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of JetElement..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of JetElement..." << endmsg;
persObj->m_eta = transObj->eta();
persObj->m_phi = transObj->phi();
@@ -57,7 +57,7 @@ void JetElementCnv_p1::transToPers( const JetElement* transObj, JetElement_p1* p
persObj->m_had_error = transObj->hadErrorVec();
persObj->m_link_error = transObj->linkErrorVec();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JetElement [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of JetElement [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/MuCTPI_RDOCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/MuCTPI_RDOCnv_p1.cxx
index 0136348f6f596fa281fe9f615f5167a95d62b6a7..0642641d36e164a599b54ca7d8e639d9c7b35fd7 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/MuCTPI_RDOCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/MuCTPI_RDOCnv_p1.cxx
@@ -24,12 +24,12 @@ MuCTPI_RDOCnv_p1::MuCTPI_RDOCnv_p1()
void MuCTPI_RDOCnv_p1::persToTrans( const MuCTPI_RDO_p1* persObj, MuCTPI_RDO* transObj,
MsgStream& log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting MuCTPI_RDO from persistent state..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting MuCTPI_RDO from persistent state..." << endmsg;
*transObj = MuCTPI_RDO (persObj->m_candidateMultiplicity,
persObj->m_dataWord);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting MuCTPI_RDO from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting MuCTPI_RDO from persistent state [OK]" << endmsg;
return;
@@ -42,12 +42,12 @@ void MuCTPI_RDOCnv_p1::persToTrans( const MuCTPI_RDO_p1* persObj, MuCTPI_RDO* tr
void MuCTPI_RDOCnv_p1::transToPers( const MuCTPI_RDO* transObj, MuCTPI_RDO_p1* persObj,
MsgStream& log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of MuCTPI_RDO..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of MuCTPI_RDO..." << endmsg;
persObj->m_candidateMultiplicity = transObj->getAllCandidateMultiplicities();
persObj->m_dataWord = transObj->dataWord();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of MuCTPI_RDO [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of MuCTPI_RDO [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCnv_p1.cxx
index 4fd9d80fe8d1a9d3e7502d52b5a1d8ebd6ef2bd0..326825e98db11f150f0cebefe8cdd0cd7d684dd7 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/RODHeaderCnv_p1.cxx
@@ -22,7 +22,7 @@ RODHeaderCnv_p1::RODHeaderCnv_p1()
void RODHeaderCnv_p1::persToTrans( const RODHeader_p1* persObj, RODHeader* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting RODHeader from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting RODHeader from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -39,7 +39,7 @@ void RODHeaderCnv_p1::persToTrans( const RODHeader_p1* persObj, RODHeader* trans
persObj->m_statusWords,
persObj->m_payloadSize);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted RODHeader from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted RODHeader from persistent state [OK]" << endmsg;
return;
@@ -47,7 +47,7 @@ void RODHeaderCnv_p1::persToTrans( const RODHeader_p1* persObj, RODHeader* trans
void RODHeaderCnv_p1::transToPers( const RODHeader* transObj, RODHeader_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of RODHeader..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of RODHeader..." << endmsg;
persObj->m_version = transObj->version();
persObj->m_sourceId = transObj->sourceID();
@@ -59,7 +59,7 @@ void RODHeaderCnv_p1::transToPers( const RODHeader* transObj, RODHeader_p1* pers
persObj->m_statusWords = transObj->statusWords();
persObj->m_payloadSize = transObj->payloadSize();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of RODHeader [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of RODHeader [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/RoIBResultCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/RoIBResultCnv_p1.cxx
index ae34f6b9b2ec153e83eb03404c0ac01a0d231370..85c4c5f855e3bc76071b0ffe54ae6d8bad77518a 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/RoIBResultCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/RoIBResultCnv_p1.cxx
@@ -24,7 +24,7 @@ RoIBResultCnv_p1::RoIBResultCnv_p1()
void RoIBResultCnv_p1::persToTrans( const RoIBResult_p1* persObj, ROIB::RoIBResult* transObj,
MsgStream& log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting ROIB::RoIBResult from persistent state..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting ROIB::RoIBResult from persistent state..." << endmsg;
ROIB::MuCTPIResult muc (ROIB::Header (persObj->m_muctpi.m_header),
ROIB::Trailer (persObj->m_muctpi.m_trailer),
@@ -58,7 +58,7 @@ void RoIBResultCnv_p1::persToTrans( const RoIBResult_p1* persObj, ROIB::RoIBResu
std::move(jetvec),
std::move(emtauvec));
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting ROIB::RoIBResult from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converting ROIB::RoIBResult from persistent state [OK]" << endmsg;
return;
@@ -71,7 +71,7 @@ void RoIBResultCnv_p1::persToTrans( const RoIBResult_p1* persObj, ROIB::RoIBResu
void RoIBResultCnv_p1::transToPers( const ROIB::RoIBResult* transObj, RoIBResult_p1* persObj,
MsgStream& log ) {
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of ROIB::RoIBResult..." << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of ROIB::RoIBResult..." << endmsg;
/////////////////////////////////////////////////////////////////
// //
@@ -129,7 +129,7 @@ void RoIBResultCnv_p1::transToPers( const ROIB::RoIBResult* transObj, RoIBResult
persObj->m_emtau.back().m_roiWords.push_back( r.roIWord() );
}
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of ROIB::RoIBResult [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Creating persistent state of ROIB::RoIBResult [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCnv_p1.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCnv_p1.cxx
index 9782893517981ae03be1cfd6ebdd9571967a398b..d730fbedd1ddf1e17a2a1d7930f3baa0285c0fa2 100755
--- a/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCnv_p1.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/src/TriggerTowerCnv_p1.cxx
@@ -22,7 +22,7 @@ TriggerTowerCnv_p1::TriggerTowerCnv_p1()
void TriggerTowerCnv_p1::persToTrans( const TriggerTower_p1* persObj, TriggerTower* transObj, MsgStream &log ) {
- //log << MSG::INFO << "Converting TriggerTower from persistent state..." << endreq;
+ //log << MSG::INFO << "Converting TriggerTower from persistent state..." << endmsg;
//transObj->clear(); // see if I actually need one of these
@@ -47,7 +47,7 @@ void TriggerTowerCnv_p1::persToTrans( const TriggerTower_p1* persObj, TriggerTow
persObj->m_had_peak,
persObj->m_had_adc_peak);
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted TriggerTower from persistent state [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Converted TriggerTower from persistent state [OK]" << endmsg;
return;
@@ -55,7 +55,7 @@ void TriggerTowerCnv_p1::persToTrans( const TriggerTower_p1* persObj, TriggerTow
void TriggerTowerCnv_p1::transToPers( const TriggerTower* transObj, TriggerTower_p1* persObj, MsgStream &log ) {
- //log << MSG::INFO << "Creating persistent state of TriggerTower..." << endreq;
+ //log << MSG::INFO << "Creating persistent state of TriggerTower..." << endmsg;
persObj->m_em_energy = transObj->emLUT();
persObj->m_had_energy = transObj->hadLUT();
@@ -75,7 +75,7 @@ void TriggerTowerCnv_p1::transToPers( const TriggerTower* transObj, TriggerTower
persObj->m_had_peak = transObj->hadPeak();
persObj->m_had_adc_peak = transObj->hadADCPeak();
- if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of TriggerTower [OK]" << endreq;
+ if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "Created persistent state of TriggerTower [OK]" << endmsg;
return;
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMCPHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMCPHitsCnv_p1_test.cxx
index 2dd95704d44ed89671354e1045a58db7ba2d2b7c..8c9c2eab8b3100ca779fdd58d5a1b02eac174cc4 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMCPHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMCPHitsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMMCPHitsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -47,6 +48,7 @@ void testit (const LVL1::CMMCPHits& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMMCPHits trans1 (1, 2,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMEtSumsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMEtSumsCnv_p1_test.cxx
index 5bd771418ccdf425fd46321a4611a6ef706b251d..517dd34e8713953ab870b37145b8fa14e8f1c8ed 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMEtSumsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMEtSumsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMMEtSumsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -49,6 +50,7 @@ void testit (const LVL1::CMMEtSums& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMMEtSums trans1 (1, 2,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMJetHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMJetHitsCnv_p1_test.cxx
index 7e2478d58829458aec08e3e316b00f329c914875..91447db2a7773dad6b5aa9d13122e50e6c69e28f 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMJetHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMJetHitsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMMJetHitsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -45,6 +46,7 @@ void testit (const LVL1::CMMJetHits& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMMJetHits trans1 (1, 2,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMRoICnv_p1_test.cxx
index 7e70417a61988abdf8a32ba9a87dc114cdac8a96..e5ab9081198fc01ec504f01845c99ac4b47e7c6d 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMMRoICnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMMRoICnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -44,6 +45,7 @@ void testit (const LVL1::CMMRoI& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMMRoI trans1 (1, 2, 3, 4);
testit (trans1);
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPHitsCnv_p1_test.cxx
index 805bd0d2b6e7a4b2de59d127b59c3cefdc0777b7..195d014656f0abdece73c1abfcfe848dc05b4e2f 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPHitsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMXCPHitsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -48,6 +49,7 @@ void testit (const LVL1::CMXCPHits& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMXCPHits trans1 (1, 2, 100,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPTobCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPTobCnv_p1_test.cxx
index 5f89ca7ed18aa046a99b0de9546f15d7d3f06b5b..8f44e1b00b465522861e2fcfa1469a93dcbaec71 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPTobCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXCPTobCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMXCPTobCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -50,6 +51,7 @@ void testit (const LVL1::CMXCPTob& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMXCPTob trans1 (1, 2, 3, 4, 5,
std::vector<int> {10, 11, 12},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXEtSumsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXEtSumsCnv_p1_test.cxx
index f14523deb32a0b247e5df2bebf267a57d7e9b9ce..60a2271c50570e4462487b3883af93ec730e8c8a 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXEtSumsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXEtSumsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMXEtSumsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -49,6 +50,7 @@ void testit (const LVL1::CMXEtSums& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMXEtSums trans1 (1, 2,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetHitsCnv_p1_test.cxx
index ad2525f4fb183c0068737ba0fdf743f74c3b38b3..9c936a0c2af4ccd7c0728d16a9920da9c7690b38 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetHitsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMXJetHitsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -47,6 +48,7 @@ void testit (const LVL1::CMXJetHits& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMXJetHits trans1 (1, 2,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetTobCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetTobCnv_p1_test.cxx
index cee49b8e78198b00153871ef3b86beffbf984070..43456a0b27baa33cc0557f3f9d6651cd0789cc49 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetTobCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXJetTobCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMXJetTobCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -49,6 +50,7 @@ void testit (const LVL1::CMXJetTob& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMXJetTob trans1 (1, 2, 3, 4,
std::vector<int> {10, 11, 12},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXRoICnv_p1_test.cxx
index e08791feb5412b3b4a479079b38e291a832ef4d0..603713d6ea6c1ab321dc08aef94daf1d5a64a99f 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CMXRoICnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CMXRoICnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -42,6 +43,7 @@ void testit (const LVL1::CMXRoI& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CMXRoI trans1 (1, 2, 3, 4, 5, 6);
testit (trans1);
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMHitsCnv_p1_test.cxx
index 66c5266445744a596a09ee2438ba205091f35e59..c027388cd459f6d8c4ad37f6910ef131cb1fe8ff 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMHitsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CPMHitsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -45,6 +46,7 @@ void testit (const LVL1::CPMHits& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CPMHits trans1 (1, 2,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMRoICnv_p1_test.cxx
index 0379829321983929b2fc7724b4c0085bed48f66b..dec5c610df95fbfa71c767a68acc7824f990ad77 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMRoICnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CPMRoICnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -41,6 +42,7 @@ void testit (const LVL1::CPMRoI& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CPMRoI trans1 (123345);
testit (trans1);
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTobRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTobRoICnv_p1_test.cxx
index 671c28c8be07c9531269462f5396b68a3e0d8a0a..65d0505c847bb96fb74785f156dd26d43cbc3ccf 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTobRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTobRoICnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CPMTobRoICnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -41,6 +42,7 @@ void testit (const LVL1::CPMTobRoI& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CPMTobRoI trans1 (123345);
testit (trans1);
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTowerCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTowerCnv_p1_test.cxx
index 9cc9a402f787ed17ac290211c4b76d3689a86544..f7b4e7a6a7557f0727f676168909988305e67350 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTowerCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CPMTowerCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CPMTowerCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -47,6 +48,7 @@ void testit (const LVL1::CPMTower& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::CPMTower trans1 (1, 2,
std::vector<int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p1_test.cxx
index 35428571b091e68cb723ccf6df861dc79254bff4..926c1a26b0276e4fa9d3ff42412204fdb7336eaf 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CTP_RDOCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -116,6 +117,7 @@ void testit (const CTP_RDO& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
std::vector<unsigned int> data (2 + 3*(6+8+8+8));
for (size_t i=0; i < data.size(); i++)
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p2_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p2_test.cxx
index 8d50c3f223e6fdb3c149527025fbb9d74f433391..412d2377ae4e03ce0129b3403f7e55f265016d46 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p2_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/CTP_RDOCnv_p2_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/CTP_RDOCnv_p2.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -116,6 +117,7 @@ void testit (const CTP_RDO& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
std::vector<unsigned int> data (2 + 3*(6+8+8+8));
for (size_t i=0; i < data.size(); i++)
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMEtSumsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMEtSumsCnv_p1_test.cxx
index ea7656ccdcd565ca64c06ea4ec3c20648d39a973..dab09e192d0192c3d14a7ec3a797452b229861f8 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMEtSumsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMEtSumsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/JEMEtSumsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -46,6 +47,7 @@ void testit (const LVL1::JEMEtSums& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::JEMEtSums trans1 (1, 2,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMHitsCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMHitsCnv_p1_test.cxx
index d0a83c223b358c4481bec22576c3ad9f5d0f5d9e..46fa6733ac0648969e12c6eb70420ccce41f9631 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMHitsCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMHitsCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/JEMHitsCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -44,6 +45,7 @@ void testit (const LVL1::JEMHits& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::JEMHits trans1 (1, 2,
std::vector<unsigned int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMRoICnv_p1_test.cxx
index 5302acf1d90431085fa140acada12c486e0a93f3..b72af47bc3db3b9619ee8c80f7a409b10a5f913c 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMRoICnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/JEMRoICnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -41,6 +42,7 @@ void testit (const LVL1::JEMRoI& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::JEMRoI trans1 (123345);
testit (trans1);
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMTobRoICnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMTobRoICnv_p1_test.cxx
index 8ac5829e375513eb2fb2d8b063b8c9c383a6897f..c0b75c5a0659e1670e9450e79bff4f436d02bc1d 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMTobRoICnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JEMTobRoICnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/JEMTobRoICnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -41,6 +42,7 @@ void testit (const LVL1::JEMTobRoI& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::JEMTobRoI trans1 (123345);
testit (trans1);
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/JetElementCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/JetElementCnv_p1_test.cxx
index d429e5b7dd134721e8f899ab0394cc9089721e53..bb797bc6211aaffb76347c2cd2d71d5022179c48 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/JetElementCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/JetElementCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/JetElementCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -49,6 +50,7 @@ void testit (const LVL1::JetElement& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::JetElement trans1 (1, 2,
std::vector<int> {3, 4, 5},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/MuCTPI_RDOCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/MuCTPI_RDOCnv_p1_test.cxx
index 34537a8b0a2e9a31c29ac745d55e4cbb2a12564e..9200426d342858f126e6c63ac515a6e96dc9db91 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/MuCTPI_RDOCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/MuCTPI_RDOCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/MuCTPI_RDOCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -42,6 +43,7 @@ void testit (const MuCTPI_RDO& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
MuCTPI_RDO trans1 (std::vector<unsigned int> {1, 2, 3},
std::vector<unsigned int> {7, 8, 9});
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/RODHeaderCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/RODHeaderCnv_p1_test.cxx
index 910e53baecef9d78dde4071881e3239e66012642..db9cd11a5b84425b4010adaf0d5999b7a534e256 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/RODHeaderCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/RODHeaderCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/RODHeaderCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -49,6 +50,7 @@ void testit (const LVL1::RODHeader& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::RODHeader trans1 (1, 2, 3, 4, 5, 6, 7,
std::vector<unsigned int> {20, 21, 22},
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/RoIBResultCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/RoIBResultCnv_p1_test.cxx
index 7d207432e6ba2e43b4cdead48f8b77e63a867b1f..2e65f2cfa490babc041f30097452af4c05fdf890 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/RoIBResultCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/RoIBResultCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/RoIBResultCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -159,6 +160,7 @@ void testit (const ROIB::RoIBResult& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
using namespace ROIB;
MuCTPIResult muc (Header (std::vector<unsigned int> {1, 2, 3}),
diff --git a/Trigger/TrigT1/TrigT1EventTPCnv/test/TriggerTowerCnv_p1_test.cxx b/Trigger/TrigT1/TrigT1EventTPCnv/test/TriggerTowerCnv_p1_test.cxx
index 5de08fb7e865434cb632f246ffb5348e809cf88c..926d1c78040f3b00c5a54e4df913149068bcfb95 100644
--- a/Trigger/TrigT1/TrigT1EventTPCnv/test/TriggerTowerCnv_p1_test.cxx
+++ b/Trigger/TrigT1/TrigT1EventTPCnv/test/TriggerTowerCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "TrigT1EventTPCnv/TriggerTowerCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -57,6 +58,7 @@ void testit (const LVL1::TriggerTower& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LVL1::TriggerTower trans1 (1, 2, 3,
std::vector<int> {3, 4, 5},