'messageService -> msgSvc; endreq -> endmsg.' (TrigSteeringEventAthenaPool-00-00-11)

	* Tagging TrigSteeringEventAthenaPool-00-00-11.
	* messageService -> msgSvc; endreq -> endmsg.

2016-11-04 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Taught the package how to build in AthAnalysisBase with CMake.
	* Removed the executable flag from the source files.
	* Tagging as TrigSteeringEventAthenaPool-00-00-10


Former-commit-id: 70b2d10d

Trigger/TrigEvent/TrigSteeringEventAthenaPool/CMakeLists.txt

+# $Id: CMakeLists.txt 782328 2016-11-04 10:56:17Z krasznaa $
 ################################################################################
 # Package: TrigSteeringEventAthenaPool
 ################################################################################
@@ -6,29 +7,45 @@
 atlas_subdir( TrigSteeringEventAthenaPool )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          GaudiKernel
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Trigger/TrigEvent/TrigSteeringEventTPCnv )
+atlas_depends_on_subdirs(
+   PUBLIC
+   Database/AthenaPOOL/AthenaPoolUtilities
+   GaudiKernel
+   Trigger/TrigEvent/TrigSteeringEvent
+   PRIVATE
+   AtlasTest/TestTools
+   Database/AthenaPOOL/AthenaPoolCnvSvc
+   Trigger/TrigEvent/TrigSteeringEventTPCnv )
+
+# Extra headers, when not building AthAnalysisBase:
+set( extra_headers )
+if( NOT XAOD_ANALYSIS )
+   set( extra_headers TrigSteeringEvent/Lvl1Result.h
+      TrigSteeringEvent/HLTResult.h )
+endif()
 
 # Component(s) in the package:
 atlas_add_poolcnv_library( TrigSteeringEventAthenaPoolPoolCnv
-                           src/*.cxx
-                           FILES TrigSteeringEvent/TrigRoiDescriptor.h TrigSteeringEvent/TrigRoiDescriptorCollection.h TrigSteeringEvent/TrigPassBits.h TrigSteeringEvent/TrigPassBitsCollection.h TrigSteeringEvent/TrigPassFlags.h TrigSteeringEvent/TrigPassFlagsCollection.h TrigSteeringEvent/GenericResult.h TrigSteeringEvent/Lvl1Result.h TrigSteeringEvent/HLTResult.h TrigSteeringEvent/TrigOperationalInfo.h TrigSteeringEvent/TrigOperationalInfoCollection.h
-                           TYPES_WITH_NAMESPACE HLT::HLTResult LVL1CTP::Lvl1Result
-                           LINK_LIBRARIES AthenaPoolUtilities GaudiKernel TrigSteeringEvent AthenaPoolCnvSvcLib TrigSteeringEventTPCnv )
+   src/*.h src/*.cxx
+   FILES TrigSteeringEvent/TrigRoiDescriptor.h
+   TrigSteeringEvent/TrigRoiDescriptorCollection.h
+   TrigSteeringEvent/TrigPassBits.h TrigSteeringEvent/TrigPassBitsCollection.h
+   TrigSteeringEvent/TrigPassFlags.h TrigSteeringEvent/TrigPassFlagsCollection.h
+   TrigSteeringEvent/GenericResult.h TrigSteeringEvent/TrigOperationalInfo.h
+   TrigSteeringEvent/TrigOperationalInfoCollection.h
+   ${extra_headers}
+   TYPES_WITH_NAMESPACE HLT::HLTResult LVL1CTP::Lvl1Result
+   LINK_LIBRARIES AthenaPoolUtilities GaudiKernel TrigSteeringEvent
+   AthenaPoolCnvSvcLib TrigSteeringEventTPCnv )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 
 # Set up (a) test(s) for the converter(s):
-if( IS_DIRECTORY ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities )
-   set( AthenaPoolUtilitiesTest_DIR
-      ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities/cmake )
+set( _dir
+   ${CMAKE_CURRENT__SOURCE_DIR}/../../../Database/AthenaPOOL/AthenaPoolUtilities )
+if( IS_DIRECTORY ${_dir} )
+   set( AthenaPoolUtilitiesTest_DIR ${_dir}/cmake )
 endif()
 find_package( AthenaPoolUtilitiesTest )
 
@@ -38,4 +55,4 @@ if( ATHENAPOOLUTILITIESTEST_FOUND )
   run_tpcnv_test( TrigSteeringEventAthenaPool_20.1.7.2 ESD-20.1.7.2 )
 else()
    message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
-endif()   
+endif()

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/HLTResultCnv.cxx

@@ -22,8 +22,8 @@ HLTResultCnv::~HLTResultCnv()
 //create persistent
 HLTResult_PERS* HLTResultCnv::createPersistent(HLT::HLTResult* transCont) 
 {
-  MsgStream mlog(messageService(), "HLTResultConverter" );
-  mlog << MSG::DEBUG << "HLTResultCnv::createPersistent " << endreq;
+  MsgStream mlog(msgSvc(), "HLTResultConverter" );
+  mlog << MSG::DEBUG << "HLTResultCnv::createPersistent " << endmsg;
 
   HLTResult_PERS* persObj = m_TPConverter->createPersistent( transCont, mlog );
 
@@ -33,21 +33,21 @@ HLTResult_PERS* HLTResultCnv::createPersistent(HLT::HLTResult* transCont)
 //create transient
 HLT::HLTResult* HLTResultCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "HLTResultConverter" );
-  mlog << MSG::DEBUG << "HLTResultCnv::createTransient " << endreq;  
+  MsgStream mlog(msgSvc(), "HLTResultConverter" );
+  mlog << MSG::DEBUG << "HLTResultCnv::createTransient " << endmsg;  
 
   static pool::Guid p1_guid("9567573D-F35E-4D5E-9A1A-A43B07D3CF3B");  
   static pool::Guid p0_guid("559D6CB9-9A54-4284-A03D-9C745352281D");
   
   if ( compareClassGuid(p1_guid) ) {
-    mlog << MSG::DEBUG << "HLTResult::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "HLTResult::reading p1 persistent object" << endmsg;
     // using auto_ptr ensures deletion of the persistent object
     std::auto_ptr< HLT::HLTResult_p1 > col_vect( poolReadObject< HLT::HLTResult_p1 >() );
     return m_TPConverter->createTransient( col_vect.get(), mlog );
   }
   
   else if( compareClassGuid(p0_guid) ){
-    mlog << MSG::DEBUG << "HLTResult::reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "HLTResult::reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     return this->poolReadObject<HLT::HLTResult>(); 
   }

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/HLTResultCnv.h

@@ -16,7 +16,7 @@
  * @author Tomasz Bold     <Tomasz.Bold@cern.ch>     - U. of California
  *
  * File and Version Information:
- * $Id: HLTResultCnv.h 719129 2016-01-21 17:02:55Z will $
+ * $Id: HLTResultCnv.h 782328 2016-11-04 10:56:17Z krasznaa $
  **********************************************************************************/
 
 #ifndef HLTResultCnv_H

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/Lvl1ResultCnv.cxx

@@ -30,8 +30,8 @@ Lvl1ResultCnv::~Lvl1ResultCnv()
 //create persistent
 Lvl1Result_PERS* Lvl1ResultCnv::createPersistent(LVL1CTP::Lvl1Result* transCont)
 {
-  MsgStream mlog(messageService(), "Lvl1ResultConverter" );
-  mlog << MSG::DEBUG << "Lvl1ResultCnv::createPersistent " << endreq;
+  MsgStream mlog(msgSvc(), "Lvl1ResultConverter" );
+  mlog << MSG::DEBUG << "Lvl1ResultCnv::createPersistent " << endmsg;
 
   Lvl1Result_PERS* persObj = m_impl->m_TPConverter_p2.createPersistent( transCont, mlog );
 
@@ -41,24 +41,24 @@ Lvl1Result_PERS* Lvl1ResultCnv::createPersistent(LVL1CTP::Lvl1Result* transCont)
 //create transient
 LVL1CTP::Lvl1Result* Lvl1ResultCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "Lvl1ResultConverter" );
-  mlog << MSG::DEBUG << "Lvl1ResultCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "Lvl1ResultConverter" );
+  mlog << MSG::DEBUG << "Lvl1ResultCnv::createTransient " << endmsg;
 
   static pool::Guid p2_guid("F4208CCF-9FAA-4F01-9C0B-26E9E59CE49F");
   static pool::Guid p1_guid("226FF990-4D6A-4957-AAAD-42172D174773");
   static pool::Guid p0_guid("18DE165E-3DB5-4EAC-867D-807DA3E217C0");
 
   if ( compareClassGuid(p1_guid) ) {
-    mlog << MSG::DEBUG << "Lvl1Result::createTransient reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "Lvl1Result::createTransient reading p1 persistent object" << endmsg;
     // using auto_ptr ensures deletion of the persistent object
     std::auto_ptr< LVL1CTP::Lvl1Result_p1 > col_vect( poolReadObject< LVL1CTP::Lvl1Result_p1 >() );
     return m_impl->m_TPConverter_p1.createTransient( col_vect.get(), mlog );
   } else if( compareClassGuid(p0_guid) ){
-    mlog << MSG::DEBUG << "Lvl1Result::createTransient reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "Lvl1Result::createTransient reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     return this->poolReadObject<LVL1CTP::Lvl1Result>();
   } else if ( compareClassGuid(p2_guid) ) {
-    mlog << MSG::DEBUG << "Lvl1Result::createTransient reading p2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "Lvl1Result::createTransient reading p2 persistent object" << endmsg;
     // using auto_ptr ensures deletion of the persistent object
     std::auto_ptr< LVL1CTP::Lvl1Result_p2 > col_vect( poolReadObject< LVL1CTP::Lvl1Result_p2 >() );
     return m_impl->m_TPConverter_p2.createTransient( col_vect.get(), mlog );

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/Lvl1ResultCnv.h

@@ -14,7 +14,7 @@
  * @author Francesca Bucci <f.bucci@cern.ch>         - U. of Geneva, Switzerland
  *
  * File and Version Information:
- * $Id: Lvl1ResultCnv.h 725210 2016-02-19 21:22:18Z ssnyder $
+ * $Id: Lvl1ResultCnv.h 782328 2016-11-04 10:56:17Z krasznaa $
  **********************************************************************************/
 
 #ifndef TrigEventAthenaPool_Lvl1ResultCnv_H

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCnv.cxx

@@ -18,8 +18,8 @@ TrigOperationalInfoCnv::~TrigOperationalInfoCnv()
 //create persistent
 TrigOperationalInfo_PERS* TrigOperationalInfoCnv::createPersistent(TrigOperationalInfo* transObj) 
 {
-  MsgStream mlog(messageService(), "TrigOperationalInfoConverter" );
-  mlog << MSG::DEBUG << "TrigOperationalInfoCnv_p1::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigOperationalInfoConverter" );
+  mlog << MSG::DEBUG << "TrigOperationalInfoCnv_p1::createPersistent" << endmsg;
 
   TrigOperationalInfo_PERS *persObj = m_TPConverter->createPersistent( transObj, mlog );
   
@@ -29,8 +29,8 @@ TrigOperationalInfo_PERS* TrigOperationalInfoCnv::createPersistent(TrigOperation
 //createTransient
 TrigOperationalInfo* TrigOperationalInfoCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigOperationalInfoConverter" );
-  mlog << MSG::DEBUG << "TrigOperationalInfoCnv_p1::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigOperationalInfoConverter" );
+  mlog << MSG::DEBUG << "TrigOperationalInfoCnv_p1::createTransient " << endmsg;
   
   static pool::Guid p1_guid("765F0281-801B-4F5C-8C4C-5BE7E7DB5E42");
 
@@ -39,7 +39,7 @@ TrigOperationalInfo* TrigOperationalInfoCnv::createTransient()
   
   if( compareClassGuid(p1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigOperationalInfoCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigOperationalInfoCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigOperationalInfo_p1 >   col_vect( this->poolReadObject< TrigOperationalInfo_p1 >() );
     trans_obj = m_TPConverter->createTransient( col_vect.get(), mlog );    
   } else {

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigOperationalInfoCollectionCnv.cxx

@@ -25,8 +25,8 @@ TrigOperationalInfoCollectionCnv::~TrigOperationalInfoCollectionCnv()
 //create persistent
 TrigOperationalInfoCollection_PERS* TrigOperationalInfoCollectionCnv::createPersistent(TrigOperationalInfoCollection* transObj) 
 {
-  MsgStream mlog(messageService(), "TrigOperationalInfoCollectionConverter" );
-  mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigOperationalInfoCollectionConverter" );
+  mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::createPersistent" << endmsg;
 
   TrigOperationalInfoCollection_PERS *persObj = m_impl->m_TPConverter_tlp1.createPersistent( transObj, mlog );
   
@@ -36,8 +36,8 @@ TrigOperationalInfoCollection_PERS* TrigOperationalInfoCollectionCnv::createPers
 //createTransient
 TrigOperationalInfoCollection* TrigOperationalInfoCollectionCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigOperationalInfoCollectionConverter" );
-  mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigOperationalInfoCollectionConverter" );
+  mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::createTransient " << endmsg;
   
   static pool::Guid tlp1_guid("7D5A0227-E28B-4228-83C5-22F8BBB90BBF");
   static pool::Guid p1_guid("B6C95F89-C1B9-4B9D-A533-F6F4B57BD277");
@@ -46,17 +46,17 @@ TrigOperationalInfoCollection* TrigOperationalInfoCollectionCnv::createTransient
   
   if( compareClassGuid(tlp1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigOperationalInfoCollection_tlp1 >   col_vect( this->poolReadObject< TrigOperationalInfoCollection_tlp1 >() );
-    mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::reading tlp1 persistent object pointer" <<  col_vect.get() << endreq;
+    mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::reading tlp1 persistent object pointer" <<  col_vect.get() << endmsg;
     trans_obj = m_impl->m_TPConverter_tlp1.createTransient( col_vect.get(), mlog );
     
   }
   else if( compareClassGuid(p1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigOperationalInfoCollection_p1 >   col_vect( this->poolReadObject< TrigOperationalInfoCollection_p1 >() );
-    mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::reading p1 persistent object pointer" <<  col_vect.get() << endreq;
+    mlog << MSG::DEBUG << "TrigOperationalInfoCollectionCnv::reading p1 persistent object pointer" <<  col_vect.get() << endmsg;
     trans_obj = m_impl->m_TPConverter.createTransient( col_vect.get(), mlog );
     
   }

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCnv.cxx

@@ -11,9 +11,9 @@ TrigPassBitsCnv::~TrigPassBitsCnv(){}
 
 //createPersistent
 TrigPassBits_PERS* TrigPassBitsCnv::createPersistent(TrigPassBits* transObj) {
-    MsgStream mlog(messageService(), "TrigPassBitsConverter" );
+    MsgStream mlog(msgSvc(), "TrigPassBitsConverter" );
 
-    mlog << MSG::DEBUG << "TrigPassBitsCnv::createPersistent" << endreq;
+    mlog << MSG::DEBUG << "TrigPassBitsCnv::createPersistent" << endmsg;
 
     TrigPassBitsCnv_p1   converter;
     TrigPassBits_PERS *persObj = converter.createPersistent( transObj, mlog );
@@ -23,9 +23,9 @@ TrigPassBits_PERS* TrigPassBitsCnv::createPersistent(TrigPassBits* transObj) {
 
 //createTransient
 TrigPassBits* TrigPassBitsCnv::createTransient() {
-    MsgStream mlog(messageService(), "TrigPassBitsConverter" );
+    MsgStream mlog(msgSvc(), "TrigPassBitsConverter" );
 
-    mlog << MSG::DEBUG << "TrigPassBitsCnv::createTransient " << endreq;
+    mlog << MSG::DEBUG << "TrigPassBitsCnv::createTransient " << endmsg;
 
     static pool::Guid p1_guid("391FFE21-5D82-471E-9FFC-B77150142B8F");
 

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassBitsCollectionCnv.cxx

@@ -11,9 +11,9 @@ static TrigPassBitsCollectionCnv_p1   TPconverter1;
 //createPersistent 
 TrigPassBitsCollection_PERS * TrigPassBitsCollectionCnv::createPersistent( TrigPassBitsCollection *transObj)
 {
-  MsgStream mlog(messageService(), "TrigPassBitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigPassBitsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigPassBitsCollectionCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigPassBitsCollectionCnv::createPersistent called" << endmsg;
   
   TrigPassBitsCollection_PERS * p_cont = TPconverter1.createPersistent( transObj, mlog );
   
@@ -25,9 +25,9 @@ TrigPassBitsCollection_PERS * TrigPassBitsCollectionCnv::createPersistent( TrigP
 //createTransient
 TrigPassBitsCollection * TrigPassBitsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigPassBitsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigPassBitsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigPassBitsCollectionCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigPassBitsCollectionCnv::createTransient called" << endmsg;
   
   static pool::Guid p1_guid( "E6E4F396-D696-4C1C-A0C4-7766E0AF9BB5" );
 

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCnv.cxx

@@ -11,10 +11,10 @@ TrigPassFlagsCnv::~TrigPassFlagsCnv(){}
 
 //createPersistent
 TrigPassFlags_PERS* TrigPassFlagsCnv::createPersistent(TrigPassFlags* transObj) {
-    MsgStream mlog(messageService(), "TrigPassFlagsConverter" );
+    MsgStream mlog(msgSvc(), "TrigPassFlagsConverter" );
 
     if(mlog.level()<=MSG::DEBUG)
-       mlog << MSG::DEBUG << "TrigPassFlagsCnv::createPersistent" << endreq;
+       mlog << MSG::DEBUG << "TrigPassFlagsCnv::createPersistent" << endmsg;
 
     TrigPassFlagsCnv_p1   converter;
     TrigPassFlags_PERS *persObj = converter.createPersistent( transObj, mlog );
@@ -24,10 +24,10 @@ TrigPassFlags_PERS* TrigPassFlagsCnv::createPersistent(TrigPassFlags* transObj)
 
 //createTransient
 TrigPassFlags* TrigPassFlagsCnv::createTransient() {
-    MsgStream mlog(messageService(), "TrigPassFlagsConverter" );
+    MsgStream mlog(msgSvc(), "TrigPassFlagsConverter" );
 
     if(mlog.level()<=MSG::DEBUG)
-       mlog << MSG::DEBUG << "TrigPassFlagsCnv::createTransient " << endreq;
+       mlog << MSG::DEBUG << "TrigPassFlagsCnv::createTransient " << endmsg;
 
     static pool::Guid p1_guid("1FA7E531-B1F9-4EC5-9BD1-FD19CE7368B6");
 

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigPassFlagsCollectionCnv.cxx

@@ -11,9 +11,9 @@ static TrigPassFlagsCollectionCnv_p1   TPconverter1;
 //createPersistent 
 TrigPassFlagsCollection_PERS * TrigPassFlagsCollectionCnv::createPersistent( TrigPassFlagsCollection *transObj)
 {
-  MsgStream mlog(messageService(), "TrigPassFlagsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigPassFlagsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigPassFlagsCollectionCnv::createPersistent called" << endreq;
+  mlog << MSG::DEBUG << "TrigPassFlagsCollectionCnv::createPersistent called" << endmsg;
   
   TrigPassFlagsCollection_PERS * p_cont = TPconverter1.createPersistent( transObj, mlog );
   
@@ -25,9 +25,9 @@ TrigPassFlagsCollection_PERS * TrigPassFlagsCollectionCnv::createPersistent( Tri
 //createTransient
 TrigPassFlagsCollection * TrigPassFlagsCollectionCnv::createTransient()
 {
-  MsgStream mlog(messageService(), "TrigPassFlagsCollectionConverter" );
+  MsgStream mlog(msgSvc(), "TrigPassFlagsCollectionConverter" );
   
-  mlog << MSG::DEBUG << "TrigPassFlagsCollectionCnv::createTransient called" << endreq;
+  mlog << MSG::DEBUG << "TrigPassFlagsCollectionCnv::createTransient called" << endmsg;
   
   static pool::Guid p1_guid( "7DE670AF-A256-4E8E-BC44-1CA30810F294" );
 

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCnv.cxx

@@ -32,8 +32,8 @@ TrigRoiDescriptorCnv::~TrigRoiDescriptorCnv()
 //create persistent
 TrigRoiDescriptor_PERS* TrigRoiDescriptorCnv::createPersistent(TrigRoiDescriptor* transObj) 
 {
-  MsgStream mlog(messageService(), "TrigRoiDescriptorConverter" );
-  mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigRoiDescriptorConverter" );
+  mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::createPersistent" << endmsg;
 
   TrigRoiDescriptor_PERS *persObj = m_TPConverters->p3.createPersistent( transObj, mlog );
   
@@ -43,8 +43,8 @@ TrigRoiDescriptor_PERS* TrigRoiDescriptorCnv::createPersistent(TrigRoiDescriptor
 //createTransient
 TrigRoiDescriptor* TrigRoiDescriptorCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigRoiDescriptorConverter" );
-  mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigRoiDescriptorConverter" );
+  mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::createTransient " << endmsg;
   
   static pool::Guid p3_guid("28F5BCC8-1F3D-47B1-8286-087F1B298F0A");
   static pool::Guid p2_guid("D53CE59B-99A8-4B25-87D5-C08D1AF4BA8A");
@@ -55,28 +55,28 @@ TrigRoiDescriptor* TrigRoiDescriptorCnv::createTransient()
   
   if( compareClassGuid(p3_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::reading p3 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::reading p3 persistent object" << endmsg;
     std::auto_ptr< TrigRoiDescriptor_p3 >   col_vect( this->poolReadObject< TrigRoiDescriptor_p3 >() );
     trans_obj = m_TPConverters->p3.createTransient( col_vect.get(), mlog );
     
   }
   else if( compareClassGuid(p2_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::reading p2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::reading p2 persistent object" << endmsg;
     std::auto_ptr< TrigRoiDescriptor_p2 >   col_vect( this->poolReadObject< TrigRoiDescriptor_p2 >() );
     trans_obj = m_TPConverters->p2.createTransient( col_vect.get(), mlog );
     
   }
   else if( compareClassGuid(p1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigRoiDescriptor_p1 >   col_vect( this->poolReadObject< TrigRoiDescriptor_p1 >() );
     trans_obj = m_TPConverters->p1.createTransient( col_vect.get(), mlog );
     
   }
   else if( compareClassGuid(p0_guid) ) {
 
-    mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::reading p0 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRoiDescriptorCnv::reading p0 persistent object" << endmsg;
     // old version from before TP separation, just return it
     trans_obj = this->poolReadObject<TrigRoiDescriptor>();
 

Trigger/TrigEvent/TrigSteeringEventAthenaPool/src/TrigRoiDescriptorCollectionCnv.cxx

@@ -39,8 +39,8 @@ TrigRoiDescriptorCollectionCnv::~TrigRoiDescriptorCollectionCnv()
 //create persistent
 TrigRoiDescriptorCollection_PERS* TrigRoiDescriptorCollectionCnv::createPersistent(TrigRoiDescriptorCollection* transObj) 
 {
-  MsgStream mlog(messageService(), "TrigRoiDescriptorCollectionConverter" );
-  mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::createPersistent" << endreq;
+  MsgStream mlog(msgSvc(), "TrigRoiDescriptorCollectionConverter" );
+  mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::createPersistent" << endmsg;
 
   TrigRoiDescriptorCollection_PERS *persObj = m_impl->m_TPConverter_p3.createPersistent( transObj, mlog );
   
@@ -50,8 +50,8 @@ TrigRoiDescriptorCollection_PERS* TrigRoiDescriptorCollectionCnv::createPersiste
 //createTransient
 TrigRoiDescriptorCollection* TrigRoiDescriptorCollectionCnv::createTransient() 
 {
-  MsgStream mlog(messageService(), "TrigRoiDescriptorCollectionConverter" );
-  mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::createTransient " << endreq;
+  MsgStream mlog(msgSvc(), "TrigRoiDescriptorCollectionConverter" );
+  mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::createTransient " << endmsg;
   
   static pool::Guid p3_guid("615418EF-EEFB-4E87-A396-7313E67C547E");
   static pool::Guid p2_guid("D1A44F23-416C-4AB6-BFFA-2EA280565D4E");
@@ -62,25 +62,25 @@ TrigRoiDescriptorCollection* TrigRoiDescriptorCollectionCnv::createTransient()
 
   if( compareClassGuid(p3_guid) ) {
 
-    mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::reading p3 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::reading p3 persistent object" << endmsg;
     std::auto_ptr< TrigRoiDescriptorCollection_p3 >   col_vect( this->poolReadObject< TrigRoiDescriptorCollection_p3 >() );
     trans_obj = m_impl->m_TPConverter_p3.createTransient( col_vect.get(), mlog );    
   }
   else if( compareClassGuid(p2_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::reading p2 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::reading p2 persistent object" << endmsg;
     std::auto_ptr< TrigRoiDescriptorCollection_p2 >   col_vect( this->poolReadObject< TrigRoiDescriptorCollection_p2 >() );
     trans_obj = m_impl->m_TPConverter_p2.createTransient( col_vect.get(), mlog );    
   }
   else if( compareClassGuid(tlp1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::reading tlp1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::reading tlp1 persistent object" << endmsg;
     std::auto_ptr< TrigRoiDescriptorCollection_tlp1 >   col_vect( this->poolReadObject< TrigRoiDescriptorCollection_tlp1 >() );
     trans_obj = m_impl->m_TPConverter_tlp1.createTransient( col_vect.get(), mlog );    
   }
   else if( compareClassGuid(p1_guid) ) {
     
-    mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::reading p1 persistent object" << endreq;
+    mlog << MSG::DEBUG << "TrigRoiDescriptorCollectionCnv::reading p1 persistent object" << endmsg;
     std::auto_ptr< TrigRoiDescriptorCollection_p1 >   col_vect( this->poolReadObject< TrigRoiDescriptorCollection_p1 >() );
     trans_obj = m_impl->m_TPConverter_p1.createTransient( col_vect.get(), mlog );    
   }