diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/share/ALFA_HitCollectionCnv_p1_test.ref b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/share/ALFA_HitCollectionCnv_p1_test.ref
index da4d965bcfdbbd243a82f9d678ad5cc537fe75a4..627cb39ff9f6dda53feeb0de19e60c4486d4d16e 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/share/ALFA_HitCollectionCnv_p1_test.ref
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/share/ALFA_HitCollectionCnv_p1_test.ref
@@ -1,3 +1,4 @@
 test1
 Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
 Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/share/ALFA_ODHitCollectionCnv_p1_test.ref b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/share/ALFA_ODHitCollectionCnv_p1_test.ref
index da4d965bcfdbbd243a82f9d678ad5cc537fe75a4..627cb39ff9f6dda53feeb0de19e60c4486d4d16e 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/share/ALFA_ODHitCollectionCnv_p1_test.ref
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/share/ALFA_ODHitCollectionCnv_p1_test.ref
@@ -1,3 +1,4 @@
 test1
 Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
 Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
+Athena::getMessageSvc: WARNING MessageSvc not found, will use std::cout
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_CLinkEventCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_CLinkEventCnv_p1.cxx
index 180cbbfc2295bd0302ba5b4bab463fe4a11d40a5..6da37c49ff64b9e62315126b8420da2a8f362e09 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_CLinkEventCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_CLinkEventCnv_p1.cxx
@@ -9,7 +9,7 @@
 void ALFA_CLinkEventCnv_p1::persToTrans(const ALFA_CLinkEvent_p1* persObj, ALFA_CLinkEvent* transObj, MsgStream &log)
 {
 	//MsgStream LogStream(Athena::getMessageSvc(), "ALFA_CLinkEventCnv_p1");
-	//LogStream<<MSG::INFO<<"MARK01-ALFA_CLinkEventCnv_p1::persToTrans"<<endreq;
+	//LogStream<<MSG::INFO<<"MARK01-ALFA_CLinkEventCnv_p1::persToTrans"<<endmsg;
 
         transObj->SetDCSFolderIDs (&persObj->m_DCSId);
 
@@ -44,13 +44,13 @@ void ALFA_CLinkEventCnv_p1::persToTrans(const ALFA_CLinkEvent_p1* persObj, ALFA_
 
 // 	m_DLGloRecEvCollCnv.persToTrans(&persObj->m_GloRecEvColl,&transObj->m_GloRecEvColl,log);
 
-	//LogStream<<MSG::INFO<<"MARK02-ALFA_CLinkEventCnv_p1::persToTrans"<<endreq;
+	//LogStream<<MSG::INFO<<"MARK02-ALFA_CLinkEventCnv_p1::persToTrans"<<endmsg;
 }
  
 void ALFA_CLinkEventCnv_p1::transToPers(const ALFA_CLinkEvent* transObj, ALFA_CLinkEvent_p1* persObj,MsgStream &log)
 {
 	//MsgStream LogStream(Athena::getMessageSvc(), "ALFA_CLinkEventCnv_p1");
-	//LogStream<<MSG::INFO<<"MARK01-ALFA_CLinkEventCnv_p1::transToPers"<<endreq;
+	//LogStream<<MSG::INFO<<"MARK01-ALFA_CLinkEventCnv_p1::transToPers"<<endmsg;
 
         persObj->m_DCSId=transObj->DCSId();
 
@@ -63,5 +63,5 @@ void ALFA_CLinkEventCnv_p1::transToPers(const ALFA_CLinkEvent* transObj, ALFA_CL
 	m_DLLocRecCorrODEvCollCnv.transToPers(&transObj->locRecCorrODEvCollLink(),&persObj->m_LocRecCorrODEvColl,log);
 // 	m_DLGloRecEvCollCnv.transToPers(&transObj->m_GloRecEvColl,&persObj->m_GloRecEvColl,log);
 
-	//LogStream<<MSG::INFO<<"MARK02-ALFA_CLinkEventCnv_p1::transToPers"<<endreq;
+	//LogStream<<MSG::INFO<<"MARK02-ALFA_CLinkEventCnv_p1::transToPers"<<endmsg;
 }
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_DigitCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_DigitCnv_p1.cxx
index 6fdc46b4d325d6b324612cedf85f99d1c4d0b462..1593c3da9c9c7122bde03a3edab2d989cc087949 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_DigitCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_DigitCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void ALFA_DigitCnv_p1::persToTrans(const ALFA_Digit_p1* persObj, ALFA_Digit* transObj, MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_DigitCnv_p1::persToTrans called " << endreq;
+   log << MSG::DEBUG << "ALFA_DigitCnv_p1::persToTrans called " << endmsg;
 
    *transObj = ALFA_Digit (persObj->m_station,
                            persObj->m_plate,
@@ -20,7 +20,7 @@ void ALFA_DigitCnv_p1::transToPers(const ALFA_Digit* transObj,
                                        ALFA_Digit_p1* persObj, 
                                        MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_DigitCnv_p1::transToPers called " << endreq;
+   log << MSG::DEBUG << "ALFA_DigitCnv_p1::transToPers called " << endmsg;
     persObj->m_plate       = transObj->getPlate();
     persObj->m_fiber       = transObj->getFiber();
     persObj->m_station     = transObj->getStation();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_GloRecEventCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_GloRecEventCnv_p1.cxx
index 6575a89149897c940cbf8b6e6436247f004fea0a..f73c2b44abe29c629a7cff28cf2eb6b32d7b666b 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_GloRecEventCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_GloRecEventCnv_p1.cxx
@@ -10,7 +10,7 @@
 
 void ALFA_GloRecEventCnv_p1::persToTrans(const ALFA_GloRecEvent_p1* persObj, ALFA_GloRecEvent* transObj, MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_GloRecEventCnv_p1::persToTrans called - version with pointers to LocRecCorr " << endreq;
+   log << MSG::DEBUG << "ALFA_GloRecEventCnv_p1::persToTrans called - version with pointers to LocRecCorr " << endmsg;
    *transObj = ALFA_GloRecEvent (persObj->m_arm,
                                  persObj->m_x,
                                  persObj->m_y,
@@ -28,7 +28,7 @@ void ALFA_GloRecEventCnv_p1::transToPers(const ALFA_GloRecEvent* transObj,
                                        ALFA_GloRecEvent_p1* persObj, 
                                        MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_GloRecEventCnv_p1::transToPers called - version with pointers to LocRecCorr " << endreq;
+   log << MSG::DEBUG << "ALFA_GloRecEventCnv_p1::transToPers called - version with pointers to LocRecCorr " << endmsg;
    persObj->m_arm       = transObj->getArmNum();
    persObj->m_x         = transObj->getXposition();
    persObj->m_y         = transObj->getYposition();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_HitCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_HitCnv_p1.cxx
index 1a8293935b213d83c6fcc38e51ea2df9bc048180..d1b30deef3bf0665af5ac8506be7ffd6093e493c 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_HitCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_HitCnv_p1.cxx
@@ -9,7 +9,7 @@
 
 void ALFA_HitCnv_p1::persToTrans(const ALFA_Hit_p1* persObj, ALFA_Hit* transObj, MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_HitCnv_p1::persToTrans called " << endreq;
+   log << MSG::DEBUG << "ALFA_HitCnv_p1::persToTrans called " << endmsg;
    
 //   HepMcParticleLinkCnv_p1 HepMcPLCnv;
 //   HepMcPLCnv.persToTrans(&(persObj->m_partLink),&(transObj->m_partLink), log);
@@ -36,7 +36,7 @@ void ALFA_HitCnv_p1::transToPers(const ALFA_Hit* transObj,
                                        ALFA_Hit_p1* persObj, 
                                        MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_HitCnv_p1::transToPers called " << endreq;
+   log << MSG::DEBUG << "ALFA_HitCnv_p1::transToPers called " << endmsg;
  //  HepMcParticleLinkCnv_p1 HepMcPLCnv;
 //    HepMcPLCnv.transToPers(&(transObj->m_partLink),&(persObj->m_partLink), log);
     persObj->hitID          = transObj->GetHitID();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecCorrEventCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecCorrEventCnv_p1.cxx
index 1297d4c80150e95c051e9b5f8a5bf7552f46cf4e..c500cdc40098bebb97092f8fc29c1af539a59fb9 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecCorrEventCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecCorrEventCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void ALFA_LocRecCorrEventCnv_p1::persToTrans(const ALFA_LocRecCorrEvent_p1* persObj, ALFA_LocRecCorrEvent* transObj, MsgStream &log)
 {
-	log << MSG::DEBUG << "ALFA_LocRecCorrEventCnv_p1::persToTrans called " << endreq;
+	log << MSG::DEBUG << "ALFA_LocRecCorrEventCnv_p1::persToTrans called " << endmsg;
 
         *transObj = ALFA_LocRecCorrEvent (persObj->m_iAlgoNum,
                                           persObj->m_pot_num,
@@ -28,7 +28,7 @@ void ALFA_LocRecCorrEventCnv_p1::transToPers(const ALFA_LocRecCorrEvent* transOb
                                        ALFA_LocRecCorrEvent_p1* persObj, 
                                        MsgStream &log)
 {
-	log << MSG::DEBUG << "ALFA_LocRecCorrEventCnv_p1::transToPers called " << endreq;
+	log << MSG::DEBUG << "ALFA_LocRecCorrEventCnv_p1::transToPers called " << endmsg;
 
 	persObj->m_iAlgoNum  = transObj->getAlgoNum();
 	persObj->m_pot_num   = transObj->getPotNum();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecCorrODEventCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecCorrODEventCnv_p1.cxx
index 691fe3f09b128e9c8f87bebb113b50fbfba2b71f..0c80a9baaad026390f8a08dc82d9143a2bc06bc9 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecCorrODEventCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecCorrODEventCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void ALFA_LocRecCorrODEventCnv_p1::persToTrans(const ALFA_LocRecCorrODEvent_p1* persObj, ALFA_LocRecCorrODEvent* transObj, MsgStream &log)
 {
-	log << MSG::DEBUG << "ALFA_LocRecCorrODEventCnv_p1::persToTrans called " << endreq;
+	log << MSG::DEBUG << "ALFA_LocRecCorrODEventCnv_p1::persToTrans called " << endmsg;
 
         *transObj = ALFA_LocRecCorrODEvent(persObj->m_iAlgoNum,
                                            persObj->m_pot_num,
@@ -23,7 +23,7 @@ void ALFA_LocRecCorrODEventCnv_p1::persToTrans(const ALFA_LocRecCorrODEvent_p1*
 
 void ALFA_LocRecCorrODEventCnv_p1::transToPers(const ALFA_LocRecCorrODEvent* transObj, ALFA_LocRecCorrODEvent_p1* persObj, MsgStream &log)
 {
-	log << MSG::DEBUG << "ALFA_LocRecCorrODEventCnv_p1::transToPers called " << endreq;
+	log << MSG::DEBUG << "ALFA_LocRecCorrODEventCnv_p1::transToPers called " << endmsg;
 
 	persObj->m_iAlgoNum  = transObj->getAlgoNum();
 	persObj->m_pot_num   = transObj->getPotNum();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecEventCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecEventCnv_p1.cxx
index 95ad06e824ce74293626d5f1efe0b27540d2f536..97be16e477e600f2ec8412fec1f4ebbd7f61e724 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecEventCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecEventCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void ALFA_LocRecEventCnv_p1::persToTrans(const ALFA_LocRecEvent_p1* persObj, ALFA_LocRecEvent* transObj, MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_LocRecEventCnv_p1::persToTrans called " << endreq;
+   log << MSG::DEBUG << "ALFA_LocRecEventCnv_p1::persToTrans called " << endmsg;
 
    *transObj = ALFA_LocRecEvent (persObj->m_iAlgoNum,
                                  persObj->m_pot_num,
@@ -26,7 +26,7 @@ void ALFA_LocRecEventCnv_p1::transToPers(const ALFA_LocRecEvent* transObj,
                                        ALFA_LocRecEvent_p1* persObj, 
                                        MsgStream &log)
 {
-	log << MSG::DEBUG << "ALFA_LocRecEventCnv_p1::transToPers called " << endreq;
+	log << MSG::DEBUG << "ALFA_LocRecEventCnv_p1::transToPers called " << endmsg;
 
 	persObj->m_iAlgoNum  = transObj->getAlgoNum();
 	persObj->m_pot_num   = transObj->getPotNum();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecODEventCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecODEventCnv_p1.cxx
index 6fad02ba3eb5e21cbd41c714c53eac8397afb80e..5523096c253c26cdf5a24422e06738072e24d0f9 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecODEventCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_LocRecODEventCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void ALFA_LocRecODEventCnv_p1::persToTrans(const ALFA_LocRecODEvent_p1* persObj, ALFA_LocRecODEvent* transObj, MsgStream &log)
 {
-	log << MSG::DEBUG << "ALFA_LocRecODEventCnv_p1::persToTrans called " << endreq;
+	log << MSG::DEBUG << "ALFA_LocRecODEventCnv_p1::persToTrans called " << endmsg;
 
         *transObj = ALFA_LocRecODEvent (persObj->m_iAlgoNum,
                                         persObj->m_pot_num,
@@ -22,7 +22,7 @@ void ALFA_LocRecODEventCnv_p1::persToTrans(const ALFA_LocRecODEvent_p1* persObj,
  
 void ALFA_LocRecODEventCnv_p1::transToPers(const ALFA_LocRecODEvent* transObj, ALFA_LocRecODEvent_p1* persObj, MsgStream &log)
 {
-	log << MSG::DEBUG << "ALFA_LocRecODEventCnv_p1::transToPers called " << endreq;
+	log << MSG::DEBUG << "ALFA_LocRecODEventCnv_p1::transToPers called " << endmsg;
 
 	persObj->m_iAlgoNum  = transObj->getAlgoNum();
 	persObj->m_pot_num   = transObj->getPotNum();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_ODDigitCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_ODDigitCnv_p1.cxx
index 9fef119b1b69b782dbf6deefb293acf3ffc1e196..9d0f040b54ac182fe2c08f73fa3d7327dcc82b73 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_ODDigitCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_ODDigitCnv_p1.cxx
@@ -8,7 +8,7 @@
 
 void ALFA_ODDigitCnv_p1::persToTrans(const ALFA_ODDigit_p1* persObj, ALFA_ODDigit* transObj, MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_ODDigitCnv_p1::persToTrans called " << endreq;
+   log << MSG::DEBUG << "ALFA_ODDigitCnv_p1::persToTrans called " << endmsg;
 
    *transObj = ALFA_ODDigit (persObj->m_station,
                              persObj->m_side,
@@ -21,7 +21,7 @@ void ALFA_ODDigitCnv_p1::transToPers(const ALFA_ODDigit* transObj,
                                        ALFA_ODDigit_p1* persObj, 
                                        MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_ODDigitCnv_p1::transToPers called " << endreq;
+   log << MSG::DEBUG << "ALFA_ODDigitCnv_p1::transToPers called " << endmsg;
    persObj->m_plate       = transObj->getPlate();
    persObj->m_side        = transObj->getSide();    
    persObj->m_fiber       = transObj->getFiber();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_ODHitCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_ODHitCnv_p1.cxx
index 0b0e53828f0f0bca70934f8ad11692d2a8590e17..d25f7e88b8cfeaaaeaa594a1de8b4e280ce8ac59 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_ODHitCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_ODHitCnv_p1.cxx
@@ -9,7 +9,7 @@
 
 void ALFA_ODHitCnv_p1::persToTrans(const ALFA_ODHit_p1* persObj, ALFA_ODHit* transObj, MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_ODHitCnv_p1::persToTrans called " << endreq;
+   log << MSG::DEBUG << "ALFA_ODHitCnv_p1::persToTrans called " << endmsg;
    
 //   HepMcParticleLinkCnv_p1 HepMcPLCnv;
 //   HepMcPLCnv.persToTrans(&(persObj->m_partLink),&(transObj->m_partLink), log);
@@ -37,7 +37,7 @@ void ALFA_ODHitCnv_p1::transToPers(const ALFA_ODHit* transObj,
                                        ALFA_ODHit_p1* persObj, 
                                        MsgStream &log)
 {
-   log << MSG::DEBUG << "ALFA_ODHitCnv_p1::transToPers called " << endreq;
+   log << MSG::DEBUG << "ALFA_ODHitCnv_p1::transToPers called " << endmsg;
  //  HepMcParticleLinkCnv_p1 HepMcPLCnv;
 //    HepMcPLCnv.transToPers(&(transObj->m_partLink),&(persObj->m_partLink), log);   
     persObj->hitID          = transObj->GetHitID();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCnv_charge_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCnv_charge_p1.cxx
index 4d11e991313969fed58980602ec4e7e4004bbdc7..656e34245fc5b6b49911d72580167ba7c64027eb 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCnv_charge_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCnv_charge_p1.cxx
@@ -10,7 +10,7 @@ void ALFA_RawDataCnv_charge_p1::persToTrans(const ALFA_RawData_charge_p1* persOb
 ALFA_RawData_charge* transObj, MsgStream &log) {
 
 
-  log << MSG::DEBUG << "In ALFA_RawDataCnv_charge_p1:persToTrans called" << endreq;
+  log << MSG::DEBUG << "In ALFA_RawDataCnv_charge_p1:persToTrans called" << endmsg;
 
   transObj->SetZero_PMF();
   transObj->SetChannelNum_PMF (persObj->ChannelNumId);
@@ -25,7 +25,7 @@ ALFA_RawData_charge* transObj, MsgStream &log) {
 void ALFA_RawDataCnv_charge_p1::transToPers(const ALFA_RawData_charge* transObj, ALFA_RawData_charge_p1* persObj, MsgStream &log) {
 
   
-  log << MSG::DEBUG << "In ALFA_RawDataCnv_p1:transToPers called" << endreq;
+  log << MSG::DEBUG << "In ALFA_RawDataCnv_p1:transToPers called" << endmsg;
   
   persObj->ChannelNumId  = transObj->GetChannelNum_PMF();
   persObj->PMFId  = transObj->GetPMFId_PMF();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCnv_p1.cxx
index 2b84b8ced0aabc1d1b99155d271384dad926d838..726086786056124c5cae01bd362c6e98d5dbf81b 100755
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCnv_p1.cxx
@@ -10,7 +10,7 @@ void ALFA_RawDataCnv_p1::persToTrans(const ALFA_RawData_p1* persObj,
 ALFA_RawData* transObj, MsgStream &log) {
 
 
-  log << MSG::DEBUG << "In ALFA_RawDataCnv_p1:persToTrans called" << endreq;
+  log << MSG::DEBUG << "In ALFA_RawDataCnv_p1:persToTrans called" << endmsg;
 
   transObj->SetZero_PMF();
   transObj->SetWordId_PMF (persObj->WordId);
@@ -28,7 +28,7 @@ ALFA_RawData* transObj, MsgStream &log) {
 void ALFA_RawDataCnv_p1::transToPers(const ALFA_RawData* transObj, ALFA_RawData_p1* persObj, MsgStream &log) {
 
   
-  log << MSG::DEBUG << "In ALFA_RawDataCnv_p1:transToPers called" << endreq;
+  log << MSG::DEBUG << "In ALFA_RawDataCnv_p1:transToPers called" << endmsg;
   
   persObj->WordId  = transObj->GetWordId_PMF();
   persObj->PMFId  = transObj->GetPMFId_PMF();
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCollectionCnv_charge_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCollectionCnv_charge_p1.cxx
index 0a618b89ac24f3c45aafe9d6aaf0652222c7d0cd..9019830853e590acf3399ab2344eae36f3aa5ade 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCollectionCnv_charge_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCollectionCnv_charge_p1.cxx
@@ -11,7 +11,7 @@
 
 void ALFA_RawDataCollectionCnv_charge_p1::transToPers(const ALFA_RawDataCollection_charge* transColl, ALFA_RawDataCollection_charge_p1* persColl, MsgStream& log) {
   
-  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataCollectionCnv_charge_p1::transToPers" << endreq;
+  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataCollectionCnv_charge_p1::transToPers" << endmsg;
 
   // Invoke vector converter from the base template
   ALFA_RawDataCollection_charge_Cnvp1_base_t::transToPers( transColl, persColl, log );
@@ -26,7 +26,7 @@ void ALFA_RawDataCollectionCnv_charge_p1::transToPers(const ALFA_RawDataCollecti
 
 void ALFA_RawDataCollectionCnv_charge_p1::persToTrans(const ALFA_RawDataCollection_charge_p1* persColl, ALFA_RawDataCollection_charge* transColl, MsgStream& log) {
 
-if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In  ALFA_RawDataCollectionCnv_charge_p1::persToTrans" << endreq;
+if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In  ALFA_RawDataCollectionCnv_charge_p1::persToTrans" << endmsg;
 
 
 // Invoke vector converter from the base template
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCollectionCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCollectionCnv_p1.cxx
index e598e0862d076655719f9d8e627439579f6e0d24..05761428ce67f840c6627b3531fcd030f59e0cd4 100755
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCollectionCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataCollectionCnv_p1.cxx
@@ -11,7 +11,7 @@
 
 void ALFA_RawDataCollectionCnv_p1::transToPers(const ALFA_RawDataCollection* transColl, ALFA_RawDataCollection_p1* persColl, MsgStream& log) {
   
-  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataCollectionCnv_p1::transToPers" << endreq;
+  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataCollectionCnv_p1::transToPers" << endmsg;
 
   // Invoke vector converter from the base template
   ALFA_RawDataCollection_Cnvp1_base_t::transToPers( transColl, persColl, log );
@@ -29,7 +29,7 @@ void ALFA_RawDataCollectionCnv_p1::transToPers(const ALFA_RawDataCollection* tra
 
 void ALFA_RawDataCollectionCnv_p1::persToTrans(const ALFA_RawDataCollection_p1* persColl, ALFA_RawDataCollection* transColl, MsgStream& log) {
 
-  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In  ALFA_RawDataCollectionCnv_p1::persToTrans" << endreq;
+  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In  ALFA_RawDataCollectionCnv_p1::persToTrans" << endmsg;
 
 
   // Invoke vector converter from the base template
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataContainerCnv_charge_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataContainerCnv_charge_p1.cxx
index c417abfda6f559294f1a41e494a0ae34eb77187a..d440dde1a72d247c060b1150130b375da25d2fe8 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataContainerCnv_charge_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataContainerCnv_charge_p1.cxx
@@ -8,7 +8,7 @@
 
 void ALFA_RawDataContainerCnv_charge_p1::transToPers(const ALFA_RawDataContainer_charge* transCont, ALFA_RawDataContainer_charge_p1* persCont, MsgStream& log) {
   
-  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv_charge_p1::transToPers" << endreq;
+  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv_charge_p1::transToPers" << endmsg;
 
   // Invoke vector converter from the base template
   ALFA_RawDataContainer_charge_Cnvp1_base_t::transToPers( transCont, persCont, log );
@@ -18,7 +18,7 @@ void ALFA_RawDataContainerCnv_charge_p1::transToPers(const ALFA_RawDataContainer
 void ALFA_RawDataContainerCnv_charge_p1::persToTrans(const ALFA_RawDataContainer_charge_p1* persCont, ALFA_RawDataContainer_charge* transCont, MsgStream& log) {
 
 
-if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In  ALFA_RawDataContainerCnv_charge_p1::persToTrans" << endreq;
+if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In  ALFA_RawDataContainerCnv_charge_p1::persToTrans" << endmsg;
 
 
 // Invoke vector converter from the base template
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataContainerCnv_p1.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataContainerCnv_p1.cxx
index 41bea85ae1518afc29384ad0884223715f571151..db2e97d463c6a4d81661ae8783f31ea22dda00ff 100755
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataContainerCnv_p1.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/ALFA_RawDataContainerCnv_p1.cxx
@@ -9,7 +9,7 @@
 
 void ALFA_RawDataContainerCnv_p1::transToPers(const ALFA_RawDataContainer* transCont, ALFA_RawDataContainer_p1* persCont, MsgStream& log) {
   
-  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv_p1::transToPers" << endreq;
+  if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In ALFA_RawDataContainerCnv_p1::transToPers" << endmsg;
 
   // Invoke vector converter from the base template
   ALFA_RawDataContainer_Cnvp1_base_t::transToPers( transCont, persCont, log );
@@ -27,7 +27,7 @@ void ALFA_RawDataContainerCnv_p1::transToPers(const ALFA_RawDataContainer* trans
 void ALFA_RawDataContainerCnv_p1::persToTrans(const ALFA_RawDataContainer_p1* persCont, ALFA_RawDataContainer* transCont, MsgStream& log) {
 
 
-if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In  ALFA_RawDataContainerCnv_p1::persToTrans" << endreq;
+if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "In  ALFA_RawDataContainerCnv_p1::persToTrans" << endmsg;
 
 
 // Invoke vector converter from the base template
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_CLinkEventCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_CLinkEventCnv_p1_test.cxx
index 7b8d172b090f2bb3b5b8c03f0839d0359132da12..65c86bdd37622907a3fab3eea54d3f32ec5a94d1 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_CLinkEventCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_CLinkEventCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_CLinkEventCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -61,6 +62,7 @@ void testit (const ALFA_CLinkEvent& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_CLinkEvent trans1;
 
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_DigitCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_DigitCnv_p1_test.cxx
index 8f181a218a2b28d76230d8a350cbe9a930ffd907..9c89b3e599d3ed6f8b14b48344259077a2c59654 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_DigitCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_DigitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_DigitCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -42,6 +43,7 @@ void testit (const ALFA_Digit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_Digit trans1 (123, 234, 345);
     
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_DigitCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_DigitCollectionCnv_p1_test.cxx
index 09262955b90f3ab49022da0209fd313eac4460f4..2080d1a3cdd3218cd5b787c59f28cb1fdd1079a0 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_DigitCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_DigitCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_DigitCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -51,6 +52,7 @@ void testit (const ALFA_DigitCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_DigitCollection trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_GloRecEvCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_GloRecEvCollectionCnv_p1_test.cxx
index a36f8255a03de103879ed8914afa932d0c9466a7..549154692020e82044e9ca919c84a69e389dfa24 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_GloRecEvCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_GloRecEvCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_GloRecEvCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -53,6 +54,7 @@ void testit (const ALFA_GloRecEvCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_GloRecEvCollection trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_GloRecEventCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_GloRecEventCnv_p1_test.cxx
index 1f1bfe15b6f58e88fafe848314a085481e9818d5..02ec8bfefbbfaa9aa8fb903d71bb0ec12841ef0c 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_GloRecEventCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_GloRecEventCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_GloRecEventCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -44,6 +45,7 @@ void testit (const ALFA_GloRecEvent& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_GloRecEvent trans1 (123, 10.5, 11.5, 12.5, 13.5, nullptr, nullptr);
     
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_HitCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_HitCnv_p1_test.cxx
index dff180cef1d6a0802ecf43a26182c1cf554c17b8..7fea37ee125e1659285f8a87dddf3a5f95dba6b7 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_HitCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_HitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_HitCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -54,6 +55,7 @@ void testit (const ALFA_Hit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_Hit trans1 (123, 234, 345,
                    10.5, 11.5,
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_HitCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_HitCollectionCnv_p1_test.cxx
index d6ec8c418cc3884559a19c139e3b0a21b7e79095..2ae7da97f9d4361d9f0b94dfde4fba14dcd9bd19 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_HitCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_HitCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_HitCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -64,6 +65,9 @@ void testit (const ALFA_HitCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get dvl info created outside of leak checking.
+  ALFA_HitCollection dum1 ("coll");
+  Athena_test::Leakcheck check;
 
   ALFA_HitCollection trans1 ("coll");
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrEvCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrEvCollectionCnv_p1_test.cxx
index 3ebac6f9550dd2f9a7c62dec9da5b4cc33f3d353..6f3f3f8ce23827de54a12b4b4b9daf13809d75cb 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrEvCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrEvCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_LocRecCorrEvCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -59,6 +60,7 @@ void testit (const ALFA_LocRecCorrEvCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_LocRecCorrEvCollection trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrEventCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrEventCnv_p1_test.cxx
index 73e159adf4146f544dedf98aeb65572e379988d8..8f3204c062ab54abe5abb89c05c02b0ba959dc9d 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrEventCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrEventCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_LocRecCorrEventCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -50,6 +51,7 @@ void testit (const ALFA_LocRecCorrEvent& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_LocRecCorrEvent trans1 (123, 234,
                                10.5, 11.5, 12.5,
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrODEvCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrODEvCollectionCnv_p1_test.cxx
index ce348571e0c077deb8e1a886e5b6fd6bdc42bcf8..d464dfa52307188763b01fd5637ec3e971824bd2 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrODEvCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrODEvCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_LocRecCorrODEvCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -56,6 +57,7 @@ void testit (const ALFA_LocRecCorrODEvCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_LocRecCorrODEvCollection trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrODEventCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrODEventCnv_p1_test.cxx
index 72f739dd16b17668ec0c5a0ec4742183e602adba..c5d706f2ed634fb6d54dfea20ae7a71c1775d5f6 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrODEventCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecCorrODEventCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_LocRecCorrODEventCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -47,6 +48,7 @@ void testit (const ALFA_LocRecCorrODEvent& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_LocRecCorrODEvent trans1 (123, 234, 345,
                                  10.5, 11.5,
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecEvCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecEvCollectionCnv_p1_test.cxx
index a8e1df4bfe491dbde6dfc4ceb7118bcb2d8217a3..18357b034e77887bbff760164b3c6ffe20117b1f 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecEvCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecEvCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_LocRecEvCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -57,6 +58,7 @@ void testit (const ALFA_LocRecEvCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_LocRecEvCollection trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecEventCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecEventCnv_p1_test.cxx
index 16a65b40137bc0f6fe989a6b13280e75294b7757..5476f4d43753a2b7384ca96ef3ecfe0119567975 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecEventCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecEventCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_LocRecEventCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -48,6 +49,7 @@ void testit (const ALFA_LocRecEvent& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_LocRecEvent trans1 (123, 234,
                            10.5, 11.5,
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecODEvCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecODEvCollectionCnv_p1_test.cxx
index 19152bc3adbe7cf380f0c0f92df38729e2e9ef3c..76a6c1dc14b1a986546d6c76db2b459ff1163163 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecODEvCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecODEvCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_LocRecODEvCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -55,6 +56,7 @@ void testit (const ALFA_LocRecODEvCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_LocRecODEvCollection trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecODEventCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecODEventCnv_p1_test.cxx
index 781bf9d77cdc801b29d01231bc2cf2770babc7be..df2a2faf5faa8c59b192a503311e445d6b0e3a67 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecODEventCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_LocRecODEventCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_LocRecODEventCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -46,6 +47,7 @@ void testit (const ALFA_LocRecODEvent& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_LocRecODEvent trans1 (123, 234, 345,
                              10.5, 11.5,
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODDigitCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODDigitCnv_p1_test.cxx
index dcdea80cd7359bfb337a29a993f249fd81a14854..750f4ae6c7a6173c71aad3bb2e0e6de133e9aaa6 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODDigitCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODDigitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_ODDigitCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -43,6 +44,7 @@ void testit (const ALFA_ODDigit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_ODDigit trans1 (123, 234, 345, 456);
     
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODDigitCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODDigitCollectionCnv_p1_test.cxx
index cd9012adc263323706561f0ed5bb067ac953f43f..5ddb2d37af91a43fee8270326c0647a06fac71c1 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODDigitCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODDigitCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_ODDigitCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -52,6 +53,7 @@ void testit (const ALFA_ODDigitCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_ODDigitCollection trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODHitCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODHitCnv_p1_test.cxx
index 15a59645c88f24c30279eb209e09b044c975b606..be0feb1e2526ffe4c5f86c7e3977846496c4904b 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODHitCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODHitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_ODHitCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -55,6 +56,7 @@ void testit (const ALFA_ODHit& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_ODHit trans1 (123, 234, 345,
                      10.5, 11.5,
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODHitCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODHitCollectionCnv_p1_test.cxx
index 7f6513220ecd8b072d451ca5ff598a32d0e1fe71..41523eec0f38b1a027fbd72743943d8a091fa435 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODHitCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_ODHitCollectionCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_ODHitCollectionCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -65,6 +66,9 @@ void testit (const ALFA_ODHitCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get dvl info created outside of leak checking.
+  ALFA_ODHitCollection dum1 ("coll");
+  Athena_test::Leakcheck check;
 
   ALFA_ODHitCollection trans1 ("coll");
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCnv_charge_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCnv_charge_p1_test.cxx
index a278a44fa4b23a9db05c8c9588c0e3a6c52dd794..08d905b63a70d7b5e91f19675233c4bacf2edcbe 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCnv_charge_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCnv_charge_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_RawDataCnv_charge_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -48,6 +49,7 @@ void testit (const ALFA_RawData_charge& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_RawData_charge trans1 (123);
   trans1.SetChannelNum_PMF (234);
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCnv_p1_test.cxx
index 1f6d3a56ae003cb10f0e3735abd4e841080893f4..149b2fb4fadfb6d15056fb3c6d17f9179eb1aaff 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_RawDataCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -50,6 +51,7 @@ void testit (const ALFA_RawData& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_RawData trans1 (123);
   trans1.SetWordId_PMF (234);
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCollectionCnv_charge_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCollectionCnv_charge_p1_test.cxx
index 9afaa587fa858df360f84482ff16307d4dddc300..eb4e235968db24d9f5ec5c1044ee82de9ce80f1c 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCollectionCnv_charge_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCollectionCnv_charge_p1_test.cxx
@@ -14,6 +14,7 @@
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_RawDataCollectionCnv_charge_p1.h"
 #include "CxxUtils/make_unique.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -88,6 +89,7 @@ void init_RawData (ALFA_RawData_charge& r, int o)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_RawDataCollection_charge trans1 (1124, 1123);
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCollectionCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCollectionCnv_p1_test.cxx
index f30985c2bea8b2530c62ccbc8b8bddd54d24c6ef..0b54202bc3294054659f76ddd4d4249b77cb464a 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCollectionCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataCollectionCnv_p1_test.cxx
@@ -14,6 +14,7 @@
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_RawDataCollectionCnv_p1.h"
 #include "CxxUtils/make_unique.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -92,6 +93,7 @@ void init_RawData (ALFA_RawData& r, int o)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_RawDataCollection trans1 (1123);
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataContainerCnv_charge_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataContainerCnv_charge_p1_test.cxx
index 88a5ac0b3dee1b8cde5426583a85686e5c0c1a81..49e2b975a5d11676edffd855384979d77f49c2ec 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataContainerCnv_charge_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataContainerCnv_charge_p1_test.cxx
@@ -14,6 +14,7 @@
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_RawDataContainerCnv_charge_p1.h"
 #include "CxxUtils/make_unique.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -130,6 +131,7 @@ void init_RawDataCollection (ALFA_RawDataCollection_charge& c, int o)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_RawDataContainer_charge trans1;
   for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataContainerCnv_p1_test.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataContainerCnv_p1_test.cxx
index 78c42a31bb26ff53a8d052b795c731d2304629b3..d8f97579dbf56195b9c42105e94eea230f53d69e 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataContainerCnv_p1_test.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/test/ALFA_RawDataContainerCnv_p1_test.cxx
@@ -14,6 +14,7 @@
 #undef NDEBUG
 #include "ALFA_EventTPCnv/ALFA_RawDataContainerCnv_p1.h"
 #include "CxxUtils/make_unique.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -145,6 +146,7 @@ void init_RawDataCollection (ALFA_RawDataCollection& c, int o)
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
 
   ALFA_RawDataContainer trans1;
   for (int i=0; i < 10; i++) {