'Fix dependency issue for regression tests by copying needed dumpers here from...

'Fix dependency issue for regression tests by copying needed dumpers here from PyDumper.' (EventAthenaPool-00-05-20)

	* Tagging EventAthenaPool-00-05-20.
	* Fix dependency issue for regression tests by copying needed
	dumpers here from PyDumper.

2016-07-28  scott snyder  <snyder@bnl.gov>

	* Tagging EventAthenaPool-00-05-19.
	* messageSvc -> msgSvc.

2016-07-27  scott snyder  <snyder@bnl.gov>

	* Tagging EventAthenaPool-00-05-18.
	* auto_ptr -> unique_ptr.
	* Tagging EventAthenaPool-00-05-17.
	* Missed adding a file.

2016-07-26  scott snyder  <snyder@bnl.gov>

	* Tagging EventAthenaPool-00-05-16.
...
(Long ChangeLog diff - truncated)

Event/EventAthenaPool/CMakeLists.txt

@@ -22,4 +22,20 @@ atlas_add_poolcnv_library( EventAthenaPoolPoolCnv
 
 # Install files from the package:
 atlas_install_headers( EventAthenaPool )
+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 )
+endif()
+find_package( AthenaPoolUtilitiesTest )
+
+if( ATHENAPOOLUTILITIESTEST_FOUND )
+  run_tpcnv_test( EventTPCnv_15.0.0   AOD-15.0.0-full )
+  run_tpcnv_test( EventTPCnv_17.5.0   AOD-17.5.0-full )
+  run_tpcnv_test( EventTPCnv_18.0.0   AOD-18.0.0-full )
+  run_tpcnv_test( EventTPCnv_20.1.7.2 ESD-20.1.7.2    )
+else()
+   message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
+endif()   

Event/EventAthenaPool/cmt/requirements

@@ -20,3 +20,34 @@ use AthenaPoolCnvSvc     AthenaPoolCnvSvc-*         Database/AthenaPOOL
 use AthenaKernel         AthenaKernel-*             Control
 use EventInfo            EventInfo-*                Event
 use EventTPCnv           EventTPCnv-*               Event
+
+
+private
+use TestTools            TestTools-*                AtlasTest -no_auto_imports
+
+apply_pattern declare_joboptions files="-s=../share *.py"
+
+apply_pattern athenarun_test \
+   name="EventTPCnv_15.0.0" \
+   options="EventAthenaPool/EventTPCnv_15.0.0_test.py" \
+   pre_script="${ATHENAPOOLUTILITIESROOT}/share/pre_tpcnvtest.sh EventTPCnv_15.0.0" \
+   post_script="${ATHENAPOOLUTILITIESROOT}/share/post_tpcnvtest.sh EventTPCnv_15.0.0"
+
+apply_pattern athenarun_test \
+   name="EventTPCnv_17.5.0" \
+   options="EventAthenaPool/EventTPCnv_17.5.0_test.py" \
+   pre_script="${ATHENAPOOLUTILITIESROOT}/share/pre_tpcnvtest.sh EventTPCnv_17.5.0" \
+   post_script="${ATHENAPOOLUTILITIESROOT}/share/post_tpcnvtest.sh EventTPCnv_17.5.0"
+
+apply_pattern athenarun_test \
+   name="EventTPCnv_18.0.0" \
+   options="EventAthenaPool/EventTPCnv_18.0.0_test.py" \
+   pre_script="${ATHENAPOOLUTILITIESROOT}/share/pre_tpcnvtest.sh EventTPCnv_18.0.0" \
+   post_script="${ATHENAPOOLUTILITIESROOT}/share/post_tpcnvtest.sh EventTPCnv_18.0.0"
+
+apply_pattern athenarun_test \
+   name="EventTPCnv_20.1.7.2" \
+   options="EventAthenaPool/EventTPCnv_20.1.7.2_test.py" \
+   pre_script="${ATHENAPOOLUTILITIESROOT}/share/pre_tpcnvtest.sh EventTPCnv_20.1.7.2" \
+   post_script="${ATHENAPOOLUTILITIESROOT}/share/post_tpcnvtest.sh EventTPCnv_20.1.7.2"
+

Event/EventAthenaPool/share/EventAthenaPoolTestDump.py

+##
+# $Id$
+#
+# @file EventAthenaPool/share/EventAthenaPoolTestDump.py
+# @author sss
+# @date Jul 2016
+# @brief Dump EventInfo classes for regression tests.
+#
+# This code is mostly copied from PyDumper to avoid dependency issues.
+#
+
+
+import ROOT
+
+
+def toiter (beg, end):
+    while beg != end:
+        yield beg.__deref__()
+        beg.__preinc__()
+    return
+
+def dump_EventID (e, f):
+    print >> f, '%9d %9d %9d %9d %9d %9d' % \
+          (e.run_number(),
+           e.event_number(),
+           e.time_stamp(),
+           e.time_stamp_ns_offset(),
+           e.lumi_block(),
+           e.bunch_crossing_id()),
+    return
+
+
+def dump_EventType (e, f):
+    print >> f, e.typeToString(), e.user_type(), e.mc_event_weight(),
+    return
+
+
+def dump_TriggerInfo (e, f):
+    print >> f, e.statusElement(), e.extendedLevel1ID(), e.level1TriggerType(),
+    print >> f, '\n    l2:', [x for x in e.level2TriggerInfo()],
+    print >> f, '\n    ef:', [x for x in e.eventFilterInfo()],
+    print >> f, '\n    st:', [(x.name(), x.type(), x.obeysLumiblock()) for x in e.streamTags()],
+    return
+
+
+def dump_EventInfo (e, f):
+    print >> f, e.clID(),
+    dump_EventID (e.event_ID(), f)
+    print >> f, '\n   ',
+    print >> f, e.actualInteractionsPerCrossing(), e.averageInteractionsPerCrossing(),
+    for i in range(ROOT.EventInfo.nDets):
+        print >> f, '\n     det', i, e.eventFlags(i), e.errorState(i),
+    print >> f, '\n   ',
+    dump_EventType (e.event_type(), f)
+    print >> f, '\n   tg',
+    dump_TriggerInfo (e.trigger_info(), f)
+    return
+
+
+def dump_EventStreamInfo (e, f):
+    print >> f, 'nevents: ', e.getNumberOfEvents(),
+    print >> f, '\nrun numbers: ', list(e.getRunNumbers()),
+    print >> f, '\nlb numbers: ', list(e.getLumiBlockNumbers()),
+    print >> f, '\nproc tags: ', list(e.getProcessingTags()),
+    print >> f, '\nitem list: ', [(p.first, p.second) for p in e.getItemList()],
+    for typ in list(e.getEventTypes()):
+        print >> f, '\n  ',
+        dump_EventType (typ, f)
+    return
+
+
+def dump_PileUpEventInfo (e, f):
+    dump_EventInfo (e, f)
+    for (i,s) in enumerate (toiter (e.beginSubEvt(), e.endSubEvt())):
+        print >> f, '\n   subevt', i, s.time(), s.index(), s.BCID(), s.type(),
+    return
+
+
+def get_dumper_fct(klass, ofile, nmax):
+    cname = klass.__name__
+    if cname == 'EventInfo':
+        def dumper (o):
+            return dump_EventInfo (o, ofile)
+        return dumper
+    elif cname == 'EventStreamInfo':
+        def dumper (o):
+            return dump_EventStreamInfo (o, ofile)
+        return dumper
+    elif cname == 'PileUpEventInfo':
+        def dumper (o):
+            return dump_PileUpEventInfo (o, ofile)
+        return dumper
+    else:
+        print 'xxx', cname
+        assert 0

Event/EventAthenaPool/share/EventTPCnv_15.0.0_test.py

+infile = 'aod/AOD-15.0.0/AOD-15.0.0-full.pool.root'
+keys = [
+    #EventInfo_p2
+    'McEventInfo',
+
+    #EventStreamInfo_p1
+    'InputMetaDataStore/StreamAOD',
+         ]
+
+include ('EventAthenaPool/EventAthenaPoolTestDump.py')
+include ('AthenaPoolUtilities/TPCnvTest.py')

Event/EventAthenaPool/share/EventTPCnv_17.5.0_test.py

+infile = 'aod/AOD-17.5.0/AOD-17.5.0-full.pool.root'
+keys = [
+    #EventInfo_p3
+    'McEventInfo',
+
+    #EventStreamInfo_p2
+    'InputMetaDataStore/StreamAOD',
+         ]
+
+include ('EventAthenaPool/EventAthenaPoolTestDump.py')
+include ('AthenaPoolUtilities/TPCnvTest.py')

Event/EventAthenaPool/share/EventTPCnv_18.0.0_test.py

+infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
+keys = [
+    #EventInfo_p4
+    'McEventInfo',
+
+    #EventStreamInfo_p2
+    'InputMetaDataStore/StreamAOD',
+         ]
+
+include ('EventAthenaPool/EventAthenaPoolTestDump.py')
+include ('AthenaPoolUtilities/TPCnvTest.py')

Event/EventAthenaPool/share/EventTPCnv_20.1.7.2_test.py

+infile = 'esd/ESD-20.1.7.2.pool.root'
+keys = [
+    #EventStreamInfo_p3
+    'InputMetaDataStore/StreamESD',
+
+    #PileUpEventInfo_p5
+    'OverlayEvent',
+         ]
+
+include ('EventAthenaPool/EventAthenaPoolTestDump.py')
+include ('AthenaPoolUtilities/TPCnvTest.py')

Event/EventAthenaPool/src/EventInfoCnv.cxx

@@ -48,9 +48,9 @@ EventInfoCnv::EventInfoCnv(ISvcLocator* svcloc)
 }
 
 EventInfo_PERS* EventInfoCnv::createPersistent(EventInfo* transObj) {
-    MsgStream log(messageService(), "EventInfoCnv" ); 
+    MsgStream log(msgSvc(), "EventInfoCnv" ); 
     EventInfo_PERS *persObj = TPconverter_p4.createPersistent( transObj, log );
-    log << MSG::DEBUG << "EventInfo write Success" << endreq;
+    log << MSG::DEBUG << "EventInfo write Success" << endmsg;
     return persObj; 
 }
     
@@ -62,31 +62,31 @@ EventInfo* EventInfoCnv::createTransient() {
     static pool::Guid   p1_guid("A3053CD9-47F4-4C0F-B73A-A6F93F5CC7B7");
     static pool::Guid   p0_guid("380D8BB9-B34F-470F-92CC-06C3D60F7BE4");
     if( compareClassGuid(p4_guid) ) {
-        // using auto_ptr ensures deletion of the persistent object
-        std::auto_ptr< EventInfo_p4 > col_vect( poolReadObject< EventInfo_p4 >() );
-        MsgStream log(messageService(), "EventInfoCnv" );
-        //log << MSG::DEBUG << "Reading EventInfo_p4" << endreq; 
+        // using unique_ptr ensures deletion of the persistent object
+        std::unique_ptr< EventInfo_p4 > col_vect( poolReadObject< EventInfo_p4 >() );
+        MsgStream log(msgSvc(), "EventInfoCnv" );
+        //log << MSG::DEBUG << "Reading EventInfo_p4" << endmsg; 
         return massageEventInfo(TPconverter_p4.createTransient( col_vect.get(), log ));
     }
     else if( compareClassGuid(p3_guid) ) {
-        // using auto_ptr ensures deletion of the persistent object
-        std::auto_ptr< EventInfo_p3 > col_vect( poolReadObject< EventInfo_p3 >() );
-        MsgStream log(messageService(), "EventInfoCnv" );
-        //log << MSG::DEBUG << "Reading EventInfo_p3" << endreq; 
+        // using unique_ptr ensures deletion of the persistent object
+        std::unique_ptr< EventInfo_p3 > col_vect( poolReadObject< EventInfo_p3 >() );
+        MsgStream log(msgSvc(), "EventInfoCnv" );
+        //log << MSG::DEBUG << "Reading EventInfo_p3" << endmsg; 
         return massageEventInfo(TPconverter_p3.createTransient( col_vect.get(), log ));
     }
     else if( compareClassGuid(p2_guid) ) {
-        // using auto_ptr ensures deletion of the persistent object
-        std::auto_ptr< EventInfo_p2 > col_vect( poolReadObject< EventInfo_p2 >() );
-        MsgStream log(messageService(), "EventInfoCnv" );
-        // log << MSG::DEBUG << "ILIJA Reading EventInfo_p2" << endreq; 
+        // using unique_ptr ensures deletion of the persistent object
+        std::unique_ptr< EventInfo_p2 > col_vect( poolReadObject< EventInfo_p2 >() );
+        MsgStream log(msgSvc(), "EventInfoCnv" );
+        // log << MSG::DEBUG << "ILIJA Reading EventInfo_p2" << endmsg; 
         return massageEventInfo(TPconverter_p2.createTransient( col_vect.get(), log ));
     }
     else if( compareClassGuid(p1_guid) ) {
-        // using auto_ptr ensures deletion of the persistent object
-        std::auto_ptr< EventInfo_p1 > col_vect( poolReadObject< EventInfo_p1 >() );
-        MsgStream log(messageService(), "EventInfoCnv" );
-        //log << MSG::DEBUG << "Reading EventInfo_p1" << endreq; 
+        // using unique_ptr ensures deletion of the persistent object
+        std::unique_ptr< EventInfo_p1 > col_vect( poolReadObject< EventInfo_p1 >() );
+        MsgStream log(msgSvc(), "EventInfoCnv" );
+        //log << MSG::DEBUG << "Reading EventInfo_p1" << endmsg; 
         return massageEventInfo(TPconverter_p1.createTransient( col_vect.get(), log ));
     }
     else if( compareClassGuid(p0_guid) ) {
@@ -148,28 +148,28 @@ EventInfoCnv::massageEventInfo (EventInfo* ei)
     if (!m_checkedEventSelector) {
         // Get run number parameter from the EventSelector 
         m_checkedEventSelector = true;
-        MsgStream log(messageService(), "EventInfoCnv" );
-        log << MSG::DEBUG << "massageEventInfo: check if tag is set in jobOpts" << endreq;
+        MsgStream log(msgSvc(), "EventInfoCnv" );
+        log << MSG::DEBUG << "massageEventInfo: check if tag is set in jobOpts" << endmsg;
 
         // Get name of event selector from the application manager to
         // make sure we get the one for MC signal events
         IProperty* propertyServer(0); 
         StatusCode sc = serviceLocator()->service("ApplicationMgr", propertyServer); 
         if (sc != StatusCode::SUCCESS ) {
-            log << MSG::ERROR << "massageEventInfo: Cannot get ApplicationMgr " << endreq; 
+            log << MSG::ERROR << "massageEventInfo: Cannot get ApplicationMgr " << endmsg; 
             throw std::runtime_error("Cannot get ApplicationMgr");
         }
         StringProperty property("EvtSel", "");
         sc = propertyServer->getProperty(&property);
         if (!sc.isSuccess()) {
-            log << MSG::ERROR << "unable to get EvtSel: found " << property.value() << endreq;
+            log << MSG::ERROR << "unable to get EvtSel: found " << property.value() << endmsg;
             throw std::runtime_error("Cannot get property EvtSel from the ApplicationMgr");
         }
         // Get EventSelector for ApplicationMgr
         std::string eventSelector = property.value();
         sc = serviceLocator()->service(eventSelector, propertyServer); 
         if (sc != StatusCode::SUCCESS ) {
-            log << MSG::ERROR << "massageEventInfo: Cannot get EventSelector " << eventSelector << endreq; 
+            log << MSG::ERROR << "massageEventInfo: Cannot get EventSelector " << eventSelector << endmsg; 
             throw std::runtime_error("Cannot get EventSelector");
         }
         BooleanProperty overrideRunNumber = IntegerProperty("OverrideRunNumberFromInput", false);
@@ -186,62 +186,62 @@ EventInfoCnv::massageEventInfo (EventInfo* ei)
             if (!sc.isSuccess()) {
                 log << MSG::ERROR << "massageEventInfo: unable to get RunNumber from EventSelector: found " 
                     << runNumber.value()
-                    << endreq;
+                    << endmsg;
                 throw std::runtime_error("Cannot get RunNumber");
             }
             else {
                 m_simRunNumber = (unsigned int)runNumber.value();
                 log << MSG::DEBUG << "massageEventInfo: Run number:  " << m_simRunNumber 
-                    << " obtained from " << eventSelector << endreq;
+                    << " obtained from " << eventSelector << endmsg;
             }
             IntegerProperty lumiBlockNumber = IntegerProperty("FirstLB", 0);
             sc = propertyServer->getProperty(&lumiBlockNumber);
             if (!sc.isSuccess()) {
                 log << MSG::INFO << "massageEventInfo: unable to get FirstLB from EventSelector. Using "
-                    << m_lumiBlockNumber << endreq;
+                    << m_lumiBlockNumber << endmsg;
             }
             else {
                 m_lumiBlockNumber = (unsigned int)lumiBlockNumber.value();
                 log << MSG::DEBUG << "massageEventInfo: LumiBlock number:  " << m_lumiBlockNumber 
-                    << " obtained from " << eventSelector << endreq;
+                    << " obtained from " << eventSelector << endmsg;
             }
             IntegerProperty evtsPerLumiBlock = IntegerProperty("EventsPerLB", 0);
             sc = propertyServer->getProperty(&evtsPerLumiBlock);
             if (!sc.isSuccess()) {
                 log << MSG::INFO << "massageEventInfo: unable to get EventsPerLB from EventSelector. Using "
-                    << m_evtsPerLumiBlock << endreq;
+                    << m_evtsPerLumiBlock << endmsg;
             }
             else {
                 m_evtsPerLumiBlock = (unsigned int)evtsPerLumiBlock.value();
                 log << MSG::DEBUG << "massageEventInfo: EventsPerLB:  " << m_evtsPerLumiBlock 
-                    << " obtained from " << eventSelector << endreq;
+                    << " obtained from " << eventSelector << endmsg;
             }
             IntegerProperty timeStamp = IntegerProperty("InitialTimeStamp", 0);
             sc = propertyServer->getProperty(&timeStamp);
             if (!sc.isSuccess()) {
                 log << MSG::INFO << "massageEventInfo: unable to get InitialTimeStamp from EventSelector. Using "
-                    << m_timeStamp << endreq;
+                    << m_timeStamp << endmsg;
             }
             else {
                 m_timeStamp = (unsigned int)timeStamp.value();
                 log << MSG::DEBUG << "massageEventInfo: InitialTimeStamp:  " << m_timeStamp  
-                    << " obtained from " << eventSelector << endreq;
+                    << " obtained from " << eventSelector << endmsg;
             }
             IntegerProperty timeStampInterval = IntegerProperty("TimeStampInterval", 0);
             sc = propertyServer->getProperty(&timeStampInterval);
             if (!sc.isSuccess()) {
                 log << MSG::INFO << "massageEventInfo: unable to get TimeStampInterval from EventSelector. Using "
-                    << m_timeStampInterval << endreq;
+                    << m_timeStampInterval << endmsg;
             }
             else {
                 m_timeStampInterval = (unsigned int)timeStampInterval.value();
                 log << MSG::DEBUG << "massageEventInfo: TimeStampInterval:  " << m_timeStampInterval              
-                    << " obtained from " << eventSelector << endreq;
+                    << " obtained from " << eventSelector << endmsg;
             }
         }
         else {
             log << MSG::DEBUG << "massageEventInfo: OverrideRunNumberFromInput from EventSelector is false " 
-                << endreq;
+                << endmsg;
         }
     }
 
@@ -250,9 +250,9 @@ EventInfoCnv::massageEventInfo (EventInfo* ei)
 
         // First make sure we're dealing with simulation events - if not, this is an error
         if (!(ei->event_type()->test(EventType::IS_SIMULATION))) {
-            MsgStream log(messageService(), "EventInfoCnv" );
-            log << MSG::ERROR << "massageEventInfo: trying to reset run number for data!!! " << endreq;
-            log << MSG::ERROR << "    Job option EventSelector.RunNumber should NOT be set, found it set to: " << m_simRunNumber << endreq;
+            MsgStream log(msgSvc(), "EventInfoCnv" );
+            log << MSG::ERROR << "massageEventInfo: trying to reset run number for data!!! " << endmsg;
+            log << MSG::ERROR << "    Job option EventSelector.RunNumber should NOT be set, found it set to: " << m_simRunNumber << endmsg;
             throw std::runtime_error("Trying to reset run number for DATA!!!");
         }
 

Event/EventAthenaPool/src/EventStreamInfoCnv.cxx

@@ -19,10 +19,10 @@
 
 //______________________________________________________________________________
 EventStreamInfo_PERS* EventStreamInfoCnv::createPersistent(EventStreamInfo* transObj) {
-   MsgStream log(messageService(), "EventStreamInfoConverter");
+   MsgStream log(msgSvc(), "EventStreamInfoConverter");
    EventStreamInfoCnv_p3 tPconverter_p3;
    EventStreamInfo_PERS *persObj = tPconverter_p3.createPersistent(transObj, log);
-   log << MSG::DEBUG << "Success" << endreq;
+   log << MSG::DEBUG << "Success" << endmsg;
    return(persObj);
 }
 //______________________________________________________________________________
@@ -31,21 +31,21 @@ EventStreamInfo* EventStreamInfoCnv::createTransient() {
    static pool::Guid p2_guid("9AD4889D-C8EB-4F3B-9920-D37FF092CAB6");
    static pool::Guid p1_guid("9998C282-403B-4EA5-A795-C8C9BA9909C3");
    if (compareClassGuid(p3_guid)) {
-      // using auto_ptr ensures deletion of the persistent object
-      std::auto_ptr<EventStreamInfo_p3> esi_p3(poolReadObject<EventStreamInfo_p3>());
-      MsgStream log(messageService(), "EventStreamInfoConverter");
+      // using unique_ptr ensures deletion of the persistent object
+      std::unique_ptr<EventStreamInfo_p3> esi_p3(poolReadObject<EventStreamInfo_p3>());
+      MsgStream log(msgSvc(), "EventStreamInfoConverter");
       EventStreamInfoCnv_p3 tPconverter_p3;
       return(tPconverter_p3.createTransient(esi_p3.get(), log));
    } else if (compareClassGuid(p2_guid)) {
-      // using auto_ptr ensures deletion of the persistent object
-      std::auto_ptr<EventStreamInfo_p2> esi_p2(poolReadObject<EventStreamInfo_p2>());
-      MsgStream log(messageService(), "EventStreamInfoConverter");
+      // using unique_ptr ensures deletion of the persistent object
+      std::unique_ptr<EventStreamInfo_p2> esi_p2(poolReadObject<EventStreamInfo_p2>());
+      MsgStream log(msgSvc(), "EventStreamInfoConverter");
       EventStreamInfoCnv_p2 tPconverter_p2;
       return(tPconverter_p2.createTransient(esi_p2.get(), log));
    } else if (compareClassGuid(p1_guid)) {
-      // using auto_ptr ensures deletion of the persistent object
-      std::auto_ptr<EventStreamInfo_p1> esi_p1(poolReadObject<EventStreamInfo_p1>());
-      MsgStream log(messageService(), "EventStreamInfoConverter");
+      // using unique_ptr ensures deletion of the persistent object
+      std::unique_ptr<EventStreamInfo_p1> esi_p1(poolReadObject<EventStreamInfo_p1>());
+      MsgStream log(msgSvc(), "EventStreamInfoConverter");
       EventStreamInfoCnv_p1 tPconverter_p1;
       return(tPconverter_p1.createTransient(esi_p1.get(), log));
    }

Event/EventAthenaPool/src/MergedEventInfoCnv.cxx

@@ -11,10 +11,10 @@
 #include "MergedEventInfoCnv.h"
 
 MergedEventInfo_PERS* MergedEventInfoCnv::createPersistent(MergedEventInfo* transObj) {
-    MsgStream log(messageService(), "MergedEventInfoConverter" ); 
+    MsgStream log(msgSvc(), "MergedEventInfoConverter" ); 
 	static MergedEventInfoCnv_p2  TPconv;
     MergedEventInfo_PERS *persObj = TPconv.createPersistent( transObj, log );
-    //log << MSG::DEBUG << "Success" << endreq;
+    //log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
@@ -23,23 +23,23 @@ MergedEventInfo* MergedEventInfoCnv::createTransient() {
    static pool::Guid   p1_guid("9540DED6-51E8-48A3-8F86-05CB1D9CC812");
    static pool::Guid   p0_guid("FA93B80D-82C7-4096-8A04-62885A679A6F");
    if( compareClassGuid(p2_guid) ) {
-      std::auto_ptr< MergedEventInfo_p2 > col_vect( poolReadObject< MergedEventInfo_p2 >() );
-      MsgStream log(messageService(), "MergedEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading MergedEventInfo_p2" << endreq; 
+      std::unique_ptr< MergedEventInfo_p2 > col_vect( poolReadObject< MergedEventInfo_p2 >() );
+      MsgStream log(msgSvc(), "MergedEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading MergedEventInfo_p2" << endmsg; 
       static MergedEventInfoCnv_p2   TPconverter;
       return TPconverter.createTransient( col_vect.get(), log );
    } else 
    if( compareClassGuid(p1_guid) ) {
-      std::auto_ptr< MergedEventInfo_p1 > col_vect( poolReadObject< MergedEventInfo_p1 >() );
-      MsgStream log(messageService(), "MergedEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading MergedEventInfo_p1" << endreq; 
+      std::unique_ptr< MergedEventInfo_p1 > col_vect( poolReadObject< MergedEventInfo_p1 >() );
+      MsgStream log(msgSvc(), "MergedEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading MergedEventInfo_p1" << endmsg; 
 	  static MergedEventInfoCnv_p1   TPconverter;
       return TPconverter.createTransient( col_vect.get(), log );
    }
    else if( compareClassGuid(p0_guid) ) {
       // regular object from before TP separation, just return it
-      //MsgStream log(messageService(), "MergedEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading MergedEventInfo (original)" << endreq; 
+      //MsgStream log(msgSvc(), "MergedEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading MergedEventInfo (original)" << endmsg; 
       return poolReadObject< MergedEventInfo >();
    } 
    throw std::runtime_error("Unsupported persistent version of MergedEventInfo");

Event/EventAthenaPool/src/PileUpEventInfoCnv.cxx

@@ -12,10 +12,10 @@
 
 
 PileUpEventInfo_PERS* PileUpEventInfoCnv::createPersistent(PileUpEventInfo* transObj) {
-    MsgStream log(messageService(), "PileUpEventInfoConverter" ); 
+    MsgStream log(msgSvc(), "PileUpEventInfoConverter" ); 
     static PileUpEventInfoCnv_p5   TPconverter;
     PileUpEventInfo_PERS *persObj = TPconverter.createPersistent( transObj, log );
-    //log << MSG::DEBUG << "Success" << endreq;
+    //log << MSG::DEBUG << "Success" << endmsg;
     return persObj; 
 }
     
@@ -27,50 +27,50 @@ PileUpEventInfo* PileUpEventInfoCnv::createTransient() {
    static pool::Guid   p1_guid("1A399605-8E31-4150-B766-2049FD689485");
    static pool::Guid   p0_guid("6A58157B-6B6E-430F-A72A-EAAA4BDC4AE2");
    if( compareClassGuid(p5_guid) ) {
-      // using auto_ptr ensures deletion of the persistent object
-      std::auto_ptr< PileUpEventInfo_p5 > col_vect( poolReadObject< PileUpEventInfo_p5 >() );
-      MsgStream log(messageService(), "PileUpEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading PileUpEventInfo_p5" << endreq; 
+      // using unique_ptr ensures deletion of the persistent object
+      std::unique_ptr< PileUpEventInfo_p5 > col_vect( poolReadObject< PileUpEventInfo_p5 >() );
+      MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading PileUpEventInfo_p5" << endmsg; 
 	  static PileUpEventInfoCnv_p5   TPconverter;
       return TPconverter.createTransient( col_vect.get(), log );
    }	
    else if( compareClassGuid(p4_guid) ) {
-      // using auto_ptr ensures deletion of the persistent object
-      std::auto_ptr< PileUpEventInfo_p4 > col_vect( poolReadObject< PileUpEventInfo_p4 >() );
-      MsgStream log(messageService(), "PileUpEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading PileUpEventInfo_p4" << endreq; 
+      // using unique_ptr ensures deletion of the persistent object
+      std::unique_ptr< PileUpEventInfo_p4 > col_vect( poolReadObject< PileUpEventInfo_p4 >() );
+      MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading PileUpEventInfo_p4" << endmsg; 
 	  static PileUpEventInfoCnv_p4   TPconverter;
       return TPconverter.createTransient( col_vect.get(), log );
    }	
   if( compareClassGuid(p3_guid) ) {
-      // using auto_ptr ensures deletion of the persistent object
-      std::auto_ptr< PileUpEventInfo_p3 > col_vect( poolReadObject< PileUpEventInfo_p3 >() );
-      MsgStream log(messageService(), "PileUpEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading PileUpEventInfo_p3" << endreq; 
+      // using unique_ptr ensures deletion of the persistent object
+      std::unique_ptr< PileUpEventInfo_p3 > col_vect( poolReadObject< PileUpEventInfo_p3 >() );
+      MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading PileUpEventInfo_p3" << endmsg; 
       static PileUpEventInfoCnv_p3   TPconverter;
       return TPconverter.createTransient( col_vect.get(), log );
    }
    else if( compareClassGuid(p2_guid) ) {
-      // using auto_ptr ensures deletion of the persistent object
-      std::auto_ptr< PileUpEventInfo_p2 > col_vect( poolReadObject< PileUpEventInfo_p2 >() );
-      MsgStream log(messageService(), "PileUpEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading PileUpEventInfo_p2" << endreq; 
+      // using unique_ptr ensures deletion of the persistent object
+      std::unique_ptr< PileUpEventInfo_p2 > col_vect( poolReadObject< PileUpEventInfo_p2 >() );
+      MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading PileUpEventInfo_p2" << endmsg; 
 	  static PileUpEventInfoCnv_p2   TPconverter;
       return TPconverter.createTransient( col_vect.get(), log );
    }
    else if( compareClassGuid(p1_guid) ) {
-      // using auto_ptr ensures deletion of the persistent object
-      std::auto_ptr< PileUpEventInfo_p1 > col_vect( poolReadObject< PileUpEventInfo_p1 >() );
-      MsgStream log(messageService(), "PileUpEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading PileUpEventInfo_p1" << endreq; 
+      // using unique_ptr ensures deletion of the persistent object
+      std::unique_ptr< PileUpEventInfo_p1 > col_vect( poolReadObject< PileUpEventInfo_p1 >() );
+      MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading PileUpEventInfo_p1" << endmsg; 
 	  static PileUpEventInfoCnv_p1   TPconverter;
       return TPconverter.createTransient( col_vect.get(), log );
    }
    else if( compareClassGuid(p0_guid) ) {
       // regular object from before TP separation, just return it
 
-      //MsgStream log(messageService(), "PileUpEventInfoConverter" );
-      //log << MSG::DEBUG << "Reading PileUpEventInfo (original)" << endreq; 
+      //MsgStream log(msgSvc(), "PileUpEventInfoConverter" );
+      //log << MSG::DEBUG << "Reading PileUpEventInfo (original)" << endmsg; 
       return poolReadObject< PileUpEventInfo >();
    } 
    throw std::runtime_error("Unsupported persistent version of PileUpEventInfo");

Event/EventAthenaPool/test/EventAthenaPool.xml

+<?xml version="1.0"?>
+<atn>
+   <TEST name="EventAthenaPoolTests" type="makecheck">
+      <package>Event/EventAthenaPool</package>
+      <timelimit>20</timelimit>
+      <author> scott snyder </author>
+      <mailto> snyder@bnl.gov </mailto>
+      <expectations>
+         <errorMessage>Athena exited abnormally</errorMessage>
+         <errorMessage>differ</errorMessage>
+         <warningMessage> # WARNING_MESSAGE : post.sh> ERROR</warningMessage>
+         <successMessage>check ok</successMessage>
+         <returnValue>0</returnValue>
+      </expectations>
+   </TEST>
+</atn>