From e5ab13a8e8b97a8692e9df4bb3872197145d4337 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 11 Aug 2016 16:45:09 +0200
Subject: [PATCH] 'endreq -> endmsg. messageSerivce -> msgSvc.'
(JetEventAthenaPool-00-00-35)
* Tagging JetEventAthenaPool-00-00-35.
* endreq -> endmsg. messageSerivce -> msgSvc.
Former-commit-id: f734e62a067b5d5c5016d3793c10ffd7819c5611
---
.../JetEventAthenaPool/src/JetCollectionCnv.cxx | 14 +++++++-------
.../JetEventAthenaPool/src/JetKeyDescriptorCnv.cxx | 8 ++++----
.../Jet/JetEventAthenaPool/src/JetMomentMapCnv.cxx | 12 ++++++------
.../src/JetSamplingCollectionCnv.cxx | 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.cxx b/Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.cxx
index 7690be689f1..b991c04c01b 100755
--- a/Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.cxx
+++ b/Reconstruction/Jet/JetEventAthenaPool/src/JetCollectionCnv.cxx
@@ -48,7 +48,7 @@ JetCollectionCnv::createPersistent( JetCollection* transCont )
{
MsgStream msg( msgSvc(), "JetCollectionCnv" );
- msg << MSG::DEBUG << " in createPersistent" << endreq;
+ msg << MSG::DEBUG << " in createPersistent" << endmsg;
return m_TPConverter.createPersistent (transCont, m_log);
}
@@ -63,7 +63,7 @@ JetCollection* JetCollectionCnv::createTransient()
JetCollection *transObj = 0;
- msg << MSG::DEBUG << " JetCollectionCnv::createTransient() "<< endreq;
+ msg << MSG::DEBUG << " JetCollectionCnv::createTransient() "<< endmsg;
static pool::Guid tr_guid("2FB4D25D-E217-4B8A-B865-180DE73B20E0");
static pool::Guid pj_guid("E97C0C61-0B3E-401C-B853-A3302168283E");
@@ -75,12 +75,12 @@ JetCollection* JetCollectionCnv::createTransient()
static pool::Guid tlp6_guid("77DFEE77-16A5-45DD-91FB-FDEEF2B65F7D");
if ( compareClassGuid(tlp6_guid) ) {
- msg << MSG::DEBUG << " JetCollectionCnv: calling tlp6 converter" <<endreq;
+ msg << MSG::DEBUG << " JetCollectionCnv: calling tlp6 converter" <<endmsg;
poolReadObject<JetCollection_tlp6> (m_TPConverter);
return m_TPConverter.createTransient(m_log);
} else if ( compareClassGuid(tlp5_guid) ) {
- msg << MSG::DEBUG << " JetCollectionCnv: calling tlp5 converter" <<endreq;
+ msg << MSG::DEBUG << " JetCollectionCnv: calling tlp5 converter" <<endmsg;
poolReadObject<JetCollection_tlp5> (m_tlp5_cnv);
return transObj = m_tlp5_cnv.createTransient(m_log);
@@ -90,7 +90,7 @@ JetCollection* JetCollectionCnv::createTransient()
// as we want to read out specifically JetColleciton_tlp2, not just
// the lastest guy.
- msg << MSG::DEBUG << " JetCollectionCnv: calling tlp2 converter" <<endreq;
+ msg << MSG::DEBUG << " JetCollectionCnv: calling tlp2 converter" <<endmsg;
poolReadObject<JetCollection_tlp2> (m_tlp2_cnv);
return m_tlp2_cnv.createTransient(m_log);
@@ -121,7 +121,7 @@ JetCollection* JetCollectionCnv::createTransient()
transObj = m_p3_cnv.createTransient( persObj.get(), msg );
} else if ( compareClassGuid(pj_guid) ) {
- msg << MSG::DEBUG << " creating pj_guid "<< endreq;
+ msg << MSG::DEBUG << " creating pj_guid "<< endmsg;
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr<ParticleJetContainer_p1> persObj( poolReadObject<ParticleJetContainer_p1>() );
transObj = m_pjp1_cnv.createTransient( persObj.get(), msg );
@@ -154,7 +154,7 @@ StatusCode JetCollectionCnv::initialize (void)
if (converter != 0) {
registerExtendingCnv (converter);
} else {
- m_log << MSG::FATAL << "Could not load the jet tag info converters for readback!" << endreq;
+ m_log << MSG::FATAL << "Could not load the jet tag info converters for readback!" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Reconstruction/Jet/JetEventAthenaPool/src/JetKeyDescriptorCnv.cxx b/Reconstruction/Jet/JetEventAthenaPool/src/JetKeyDescriptorCnv.cxx
index 53b24f2f2a9..18f54f8b2ec 100644
--- a/Reconstruction/Jet/JetEventAthenaPool/src/JetKeyDescriptorCnv.cxx
+++ b/Reconstruction/Jet/JetEventAthenaPool/src/JetKeyDescriptorCnv.cxx
@@ -9,8 +9,8 @@
JetKeyDescriptor_PERS* JetKeyDescriptorCnv::createPersistent(JetKeyDescriptor* transObj)
{
- MsgStream report( messageService(), "JetKeyDescriptorConverter" );
- report << MSG::DEBUG << "Writing JetKeyDescriptor_p1" << endreq;
+ MsgStream report( msgSvc(), "JetKeyDescriptorConverter" );
+ report << MSG::DEBUG << "Writing JetKeyDescriptor_p1" << endmsg;
JetKeyDescriptorCnv_p1 TPconverter;
JetKeyDescriptor_PERS *persObj = TPconverter.createPersistent( transObj, report );
@@ -27,8 +27,8 @@ JetKeyDescriptor* JetKeyDescriptorCnv::createTransient()
JetKeyDescriptorCnv_p1 TPconverter;
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr<JetKeyDescriptor_p1> jet_keydescr( poolReadObject< JetKeyDescriptor_p1 >() );
- MsgStream report( messageService(), "JetKeyDescriptorCnv" );
- report << MSG::DEBUG << "Reading JetKeyDescriptor_p1" << endreq;
+ MsgStream report( msgSvc(), "JetKeyDescriptorCnv" );
+ report << MSG::DEBUG << "Reading JetKeyDescriptor_p1" << endmsg;
return TPconverter.createTransient( jet_keydescr.get(), report );
}
throw std::runtime_error("Unsupported persistent version of JetKeyDescriptor");
diff --git a/Reconstruction/Jet/JetEventAthenaPool/src/JetMomentMapCnv.cxx b/Reconstruction/Jet/JetEventAthenaPool/src/JetMomentMapCnv.cxx
index 29e51b5eb7f..309b0573646 100644
--- a/Reconstruction/Jet/JetEventAthenaPool/src/JetMomentMapCnv.cxx
+++ b/Reconstruction/Jet/JetEventAthenaPool/src/JetMomentMapCnv.cxx
@@ -10,8 +10,8 @@
JetMomentMap_PERS* JetMomentMapCnv::createPersistent(JetMomentMap* transObj)
{
- MsgStream report( messageService(), "JetMomentMapConverter" );
- report << MSG::DEBUG << "Writing JetMomentMap_p6" << endreq;
+ MsgStream report( msgSvc(), "JetMomentMapConverter" );
+ report << MSG::DEBUG << "Writing JetMomentMap_p6" << endmsg;
JetMomentMapCnv_p6 TPconverter;
JetMomentMap_PERS *persObj = TPconverter.createPersistent( transObj, report );
@@ -29,16 +29,16 @@ JetMomentMap* JetMomentMapCnv::createTransient()
JetMomentMapCnv_p1 TPconverter;
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr<JetMomentMap_p1> jet_momentdescr( poolReadObject< JetMomentMap_p1 >() );
- MsgStream report( messageService(), "JetMomentMapCnv" );
- report << MSG::DEBUG << "Reading JetMomentMap_p6" << endreq;
+ MsgStream report( msgSvc(), "JetMomentMapCnv" );
+ report << MSG::DEBUG << "Reading JetMomentMap_p6" << endmsg;
return TPconverter.createTransient( jet_momentdescr.get(), report );
}else if( compareClassGuid(p6_guid) )
{
JetMomentMapCnv_p6 TPconverter;
// using unique_ptr ensures deletion of the persistent object
std::unique_ptr<JetMomentMap_p6> jet_momentdescr( poolReadObject< JetMomentMap_p6 >() );
- MsgStream report( messageService(), "JetMomentMapCnv" );
- report << MSG::DEBUG << "Reading JetMomentMap_p6" << endreq;
+ MsgStream report( msgSvc(), "JetMomentMapCnv" );
+ report << MSG::DEBUG << "Reading JetMomentMap_p6" << endmsg;
return TPconverter.createTransient( jet_momentdescr.get(), report );
}
diff --git a/Reconstruction/Jet/JetEventAthenaPool/src/JetSamplingCollectionCnv.cxx b/Reconstruction/Jet/JetEventAthenaPool/src/JetSamplingCollectionCnv.cxx
index b1ca5fc3f4f..a1f4ef5a4f0 100644
--- a/Reconstruction/Jet/JetEventAthenaPool/src/JetSamplingCollectionCnv.cxx
+++ b/Reconstruction/Jet/JetEventAthenaPool/src/JetSamplingCollectionCnv.cxx
@@ -43,7 +43,7 @@ JetSamplingCollectionCnv::createPersistent( JetSamplingCollection* transCont )
JetSamplingCollectionCnv_p2 cnv;
JetSamplingCollection_PERS *persObj = cnv.createPersistent( transCont, msg );
- msg << MSG::DEBUG << "::createPersistent [Success]" << endreq;
+ msg << MSG::DEBUG << "::createPersistent [Success]" << endmsg;
return persObj;
}
--
GitLab