From 5d59e0290c09904e8d3d5aa776136ea45d60dca3 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Mon, 12 Dec 2016 17:18:56 +0100
Subject: [PATCH] endreq -> endmsg. (LUCID_EventTPCnv-00-08-04)
* Tagging LUCID_EventTPCnv-00-08-04.
* endreq -> endmsg.
* Tagging LUCID_EventTPCnv-00-08-03.
* Add leak checking to unit tests.
---
.../LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx | 4 ++--
.../LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx | 4 ++--
.../LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx | 4 ++--
.../LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx | 4 ++--
.../LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx | 4 ++--
.../LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx | 4 ++--
.../LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx | 4 ++--
.../LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx | 2 ++
.../LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx | 2 ++
.../LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx | 2 ++
.../LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx | 2 ++
.../LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx | 2 ++
.../test/LUCID_RawDataContainerCnv_p1_test.cxx | 2 ++
.../LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx | 2 ++
14 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx
index 48df46e330f..f265c031055 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p1.cxx
@@ -8,7 +8,7 @@
void LUCID_DigitCnv_p1::persToTrans(const LUCID_Digit_p1* persObj, LUCID_Digit* transObj, MsgStream &log) {
- log << MSG::DEBUG << " In LUCID_DigitCnv_p1::persToTrans " << endreq;
+ log << MSG::DEBUG << " In LUCID_DigitCnv_p1::persToTrans " << endmsg;
*transObj = LUCID_Digit (persObj->m_tubeID,
persObj->m_npe,
@@ -21,7 +21,7 @@ void LUCID_DigitCnv_p1::persToTrans(const LUCID_Digit_p1* persObj, LUCID_Digit*
void LUCID_DigitCnv_p1::transToPers(const LUCID_Digit* transObj, LUCID_Digit_p1* persObj, MsgStream& log) {
- log << MSG::DEBUG << " In LUCID_DigitCnv_p1::transToPers " << endreq;
+ log << MSG::DEBUG << " In LUCID_DigitCnv_p1::transToPers " << endmsg;
persObj->m_tubeID = transObj->getTubeID();
persObj->m_npe = transObj->getNpe();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx
index aae9cce11cb..e8d1e0be52b 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitCnv_p2.cxx
@@ -8,7 +8,7 @@
void LUCID_DigitCnv_p2::persToTrans(const LUCID_Digit_p2* persObj, LUCID_Digit* transObj, MsgStream &log) {
- log << MSG::DEBUG << " In LUCID_DigitCnv_p2::persToTrans " << endreq;
+ log << MSG::DEBUG << " In LUCID_DigitCnv_p2::persToTrans " << endmsg;
*transObj = LUCID_Digit (persObj->m_tubeID,
persObj->m_npe,
@@ -21,7 +21,7 @@ void LUCID_DigitCnv_p2::persToTrans(const LUCID_Digit_p2* persObj, LUCID_Digit*
void LUCID_DigitCnv_p2::transToPers(const LUCID_Digit* transObj, LUCID_Digit_p2* persObj, MsgStream& log) {
- log << MSG::DEBUG << " In LUCID_DigitCnv_p2::transToPers " << endreq;
+ log << MSG::DEBUG << " In LUCID_DigitCnv_p2::transToPers " << endmsg;
persObj->m_tubeID = transObj->getTubeID();
persObj->m_npe = transObj->getNpe();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx
index 5109dcbc7b2..774e1bf2fa5 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p1.cxx
@@ -9,7 +9,7 @@ static LUCID_DigitCnv_p1 digitConv;
void LUCID_DigitContainerCnv_p1::transToPers(const LUCID_DigitContainer* transObj, LUCID_DigitContainer_p1* persObj, MsgStream& log) {
- log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p1::transToPers" << endreq;
+ log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p1::transToPers" << endmsg;
persObj->resize(transObj->size());
@@ -23,7 +23,7 @@ void LUCID_DigitContainerCnv_p1::transToPers(const LUCID_DigitContainer* transOb
void LUCID_DigitContainerCnv_p1::persToTrans(const LUCID_DigitContainer_p1* persObj, LUCID_DigitContainer* transObj, MsgStream& log) {
- log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p1::persToTrans" << endreq;
+ log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p1::persToTrans" << endmsg;
transObj->reserve(persObj->size());
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx
index 95420870335..d0e407276e4 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_DigitContainerCnv_p2.cxx
@@ -9,7 +9,7 @@ static LUCID_DigitCnv_p2 digitConv_p2;
void LUCID_DigitContainerCnv_p2::transToPers(const LUCID_DigitContainer* transObj, LUCID_DigitContainer_p2* persObj, MsgStream& log) {
- log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p2::transToPers" << endreq;
+ log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p2::transToPers" << endmsg;
persObj->resize(transObj->size());
@@ -23,7 +23,7 @@ void LUCID_DigitContainerCnv_p2::transToPers(const LUCID_DigitContainer* transOb
void LUCID_DigitContainerCnv_p2::persToTrans(const LUCID_DigitContainer_p2* persObj, LUCID_DigitContainer* transObj, MsgStream& log) {
- log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p2::persToTrans" << endreq;
+ log << MSG::DEBUG << "In LUCID_DigitContainerCnv_p2::persToTrans" << endmsg;
transObj->reserve(persObj->size());
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx
index 4dbea949f43..d1016547c26 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataCnv_p1.cxx
@@ -9,7 +9,7 @@
void LUCID_RawDataCnv_p1::persToTrans(const LUCID_RawData_p1* persObj, LUCID_RawData* transObj, MsgStream &log) {
- log << MSG::DEBUG << "In LUCID_RawDataCnv_p1:persToTrans" << endreq;
+ log << MSG::DEBUG << "In LUCID_RawDataCnv_p1:persToTrans" << endmsg;
transObj->setWord0 (persObj->m_word0);
transObj->setWord1 (persObj->m_word1);
@@ -31,7 +31,7 @@ void LUCID_RawDataCnv_p1::persToTrans(const LUCID_RawData_p1* persObj, LUCID_Raw
void LUCID_RawDataCnv_p1::transToPers(const LUCID_RawData* transObj, LUCID_RawData_p1* persObj, MsgStream &log) {
- log << MSG::DEBUG << "In LUCID_RawDataCnv_p1:transToPers" << endreq;
+ log << MSG::DEBUG << "In LUCID_RawDataCnv_p1:transToPers" << endmsg;
persObj->m_word0 = transObj->getWord0();
persObj->m_word1 = transObj->getWord1();
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx
index dce648a2d8b..652b21bebed 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_RawDataContainerCnv_p1.cxx
@@ -9,7 +9,7 @@ static LUCID_RawDataCnv_p1 rawDataConv;
void LUCID_RawDataContainerCnv_p1::transToPers(const LUCID_RawDataContainer* transObj, LUCID_RawDataContainer_p1* persObj, MsgStream& log) {
- log << MSG::DEBUG << "In LUCID_RawDataContainerCnv_p1::transToPers" << endreq;
+ log << MSG::DEBUG << "In LUCID_RawDataContainerCnv_p1::transToPers" << endmsg;
persObj->resize(transObj->size());
@@ -23,7 +23,7 @@ void LUCID_RawDataContainerCnv_p1::transToPers(const LUCID_RawDataContainer* tra
void LUCID_RawDataContainerCnv_p1::persToTrans(const LUCID_RawDataContainer_p1* persObj, LUCID_RawDataContainer* transObj, MsgStream& log) {
- log << MSG::DEBUG << "In LUCID_RawDataContainerCnv_p1::persToTrans" << endreq;
+ log << MSG::DEBUG << "In LUCID_RawDataContainerCnv_p1::persToTrans" << endmsg;
transObj->reserve(persObj->size());
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx
index 80ce0ce8dbf..f0d0eafba6f 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/src/LUCID_SimHitCnv_p1.cxx
@@ -9,7 +9,7 @@
void LUCID_SimHitCnv_p1::persToTrans(const LUCID_SimHit_p1* persObj, LUCID_SimHit* transObj, MsgStream& log) {
- log << MSG::DEBUG << "LUCID_SimHitCnv_p1::persToTrans called " << endreq;
+ log << MSG::DEBUG << "LUCID_SimHitCnv_p1::persToTrans called " << endmsg;
// redundant with m_track.
//HepMcParticleLinkCnv_p1 HepMcPLCnv;
@@ -32,7 +32,7 @@ void LUCID_SimHitCnv_p1::persToTrans(const LUCID_SimHit_p1* persObj, LUCID_SimHi
void LUCID_SimHitCnv_p1::transToPers(const LUCID_SimHit* transObj, LUCID_SimHit_p1* persObj, MsgStream& log) {
- log << MSG::DEBUG << "LUCID_SimHitCnv_p1::transToPers called " << endreq;
+ log << MSG::DEBUG << "LUCID_SimHitCnv_p1::transToPers called " << endmsg;
HepMcParticleLinkCnv_p1 HepMcPLCnv;
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx
index 0aae053fd15..ea5097745b4 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "LUCID_EventTPCnv/LUCID_DigitCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include <cassert>
#include <iostream>
@@ -46,6 +47,7 @@ void testit (const LUCID_Digit& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LUCID_Digit trans1 (1, 2, 3, 4, 5, 6, true);
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx
index 1b5bd9c03f2..813dcd1e4c1 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitCnv_p2_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "LUCID_EventTPCnv/LUCID_DigitCnv_p2.h"
+#include "TestTools/leakcheck.h"
#include <cassert>
#include <iostream>
@@ -46,6 +47,7 @@ void testit (const LUCID_Digit& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LUCID_Digit trans1 (1, 2.5, 3, 4, 5, 6, true);
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx
index b956bea260a..a5bb85aba2e 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "LUCID_EventTPCnv/LUCID_DigitContainerCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include <cassert>
#include <iostream>
@@ -56,6 +57,7 @@ void testit (const LUCID_DigitContainer& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LUCID_DigitContainer trans1;
for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx
index 8bc2ecce2ca..134d19593ad 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_DigitContainerCnv_p2_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "LUCID_EventTPCnv/LUCID_DigitContainerCnv_p2.h"
+#include "TestTools/leakcheck.h"
#include <cassert>
#include <iostream>
@@ -56,6 +57,7 @@ void testit (const LUCID_DigitContainer& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LUCID_DigitContainer trans1;
for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx
index e6456364812..6da576de2af 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "LUCID_EventTPCnv/LUCID_RawDataCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include <cassert>
#include <iostream>
@@ -55,6 +56,7 @@ void testit (const LUCID_RawData& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LUCID_RawData trans1 (1, 2, 3, 4,
5, 6, 7, 8,
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataContainerCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataContainerCnv_p1_test.cxx
index 5e3cf7262a0..99cba3fadc8 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataContainerCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_RawDataContainerCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "LUCID_EventTPCnv/LUCID_RawDataContainerCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include <cassert>
#include <iostream>
@@ -64,6 +65,7 @@ void testit (const LUCID_RawDataContainer& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LUCID_RawDataContainer trans1;
for (int i=0; i < 10; i++) {
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx
index 3c560298bda..3a7a3928f3c 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/test/LUCID_SimHitCnv_p1_test.cxx
@@ -13,6 +13,7 @@
#undef NDEBUG
#include "LUCID_EventTPCnv/LUCID_SimHitCnv_p1.h"
+#include "TestTools/leakcheck.h"
#include <cassert>
#include <iostream>
@@ -54,6 +55,7 @@ void testit (const LUCID_SimHit& trans1)
void test1()
{
std::cout << "test1\n";
+ Athena_test::Leakcheck check;
LUCID_SimHit trans1 (1, 2, 3, 4,
5.5, 6.5, 7.5,
--
GitLab