Merge branch 'master' into 'ATLASRECTS-4482'

# Conflicts:
#   MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx

Calorimeter/CaloCalibHitRec/share/jobOptions_SimpleCaloRec.py

@@ -63,8 +63,6 @@ include( "TileConditions/TileConditions_jobOptions.py" )
 include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
 include( "TileIdCnv/TileIdCnv_jobOptions.py" )
 include( "LArDetDescr/LArDetDescr_joboptions.py" )
-from CaloTools.CaloNoiseToolDefault import CaloNoiseToolDefault
-ToolSvc += CaloNoiseToolDefault()
 
 # data from pool
 include( "EventAthenaPool/EventAthenaPool_joboptions.py" )

Calorimeter/CaloTools/src/CaloNoiseCondAlg.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloNoiseCondAlg.h" 
@@ -36,10 +36,9 @@ StatusCode CaloNoiseCondAlg::initialize() {
 
   ATH_CHECK( m_hvCorrKey.initialize(m_useHVCorr) );
 
-  if (m_lumi0<0) {
-    if (m_lumiFolderKey.initialize().isFailure()) {
+  const bool doLumiFolderInit = m_lumi0 < 0;
+  if (m_lumiFolderKey.initialize(doLumiFolderInit).isFailure()) {
       ATH_MSG_ERROR("Luminosity set to < 0 but failed to initialize LumiFolder");
-    }
   }
  
   ATH_CHECK( m_cablingKey.initialize() );

Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolAuxContainerCnv.icc

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthenaPoolCnvSvc/T_AthenaPoolAuxContainerCnv.icc
@@ -9,6 +9,7 @@
  */
 
 
+#include "AthenaPoolCnvSvc/exceptions.h"
 #include "AthContainers/tools/copyThinned.h"
 #include "AthenaKernel/getThinningCache.h"
 
@@ -46,8 +47,13 @@ T_AthenaPoolAuxContainerCnv<AUXSTORE, TPCNVS...>::createPersistentWithKey( AUXST
   try {
      const SG::ThinningInfo* info = SG::getThinningInfo (key2);
      return SG::copyThinned (*trans, info).release();
-  }catch( const std::exception &ex ) {
-     throw std::runtime_error( std::string("Exception from AuxContainer Thinning of type: ") + typeid(ex).name() + ", msg: " + ex.what());
+  }
+  catch( const std::exception &ex ) {
+    AthenaPoolCnvSvc::throwExcCaughtException (__PRETTY_FUNCTION__,
+                                               "thinning aux container",
+                                               ex,
+                                               typeid(AUXSTORE),
+                                               key);
   }
 }
 

Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCnvBase.icc

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file T_AthenaPoolCnvBase.icc
@@ -22,6 +22,7 @@
 #include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/ClassName.h"
 #include "AthenaKernel/StorableConversions.h"
+#include "AthenaPoolCnvSvc/exceptions.h"
 
 //__________________________________________________________________________
 template <class T>
@@ -85,16 +86,19 @@ StatusCode T_AthenaPoolCnvBase<T>::DataObjectToPool(IOpaqueAddress* pAddr, DataO
 template <class T>
 StatusCode T_AthenaPoolCnvBase<T>::PoolToDataObject(DataObject*& pObj,
                                                     const Token* token,
-                                                    const std::string& /*key*/)
+                                                    const std::string& key)
 {
    const std::string className = ClassName<T>::name();
    void* voidPtr = nullptr;
    try {
       m_athenaPoolCnvSvc->setObjPtr(voidPtr, token);
-   } catch (std::exception &e) {
-      std::string error = e.what();
-      ATH_MSG_ERROR("poolToObject: caught error: " << error);
-      return(StatusCode::FAILURE);
+   }
+   catch (const std::exception& ex) {
+     AthenaPoolCnvSvc::throwExcCaughtException (__PRETTY_FUNCTION__,
+                                                "converting to DataObject",
+                                                ex,
+                                                typeid(T),
+                                                key);
    }
    T* obj = reinterpret_cast<T*>(voidPtr);
    pObj = SG::asStorable(obj);

Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCoolMultChanCnv.icc

@@ -278,7 +278,7 @@ T_AthenaPoolCoolMultChanCnv<COLL_T, ELEM_T, ELEM_P>::attrListCollToObject(CondAt
             token=attrList["PoolRef"].data<std::string>();
 	}
         // FIXME exception
-	catch(std::exception& x) {
+	catch(const std::exception& x) {
 	    ATH_MSG_ERROR("PoolRef not found in attribute list");
 	    return(StatusCode::FAILURE);
 	}

Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustCnv.icc

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file T_AthenaPoolCustCnv.icc
@@ -8,6 +8,7 @@
  **/
 
 #include "AthenaPoolCnvSvc/IAthenaPoolCnvSvc.h"
+#include "AthenaPoolCnvSvc/exceptions.h"
 
 #include "GaudiKernel/StatusCode.h"
 #include "GaudiKernel/DataObject.h"
@@ -81,9 +82,13 @@ StatusCode T_AthenaPoolCustCnv<TRANS, PERS>::poolToObject(const Token*& token, P
    void* voidPtr = nullptr;
    try {
       this->m_athenaPoolCnvSvc->setObjPtr(voidPtr, token);
-   } catch (std::exception &e) {
-      ATH_MSG_ERROR("poolToObject: caught error: " << e.what());
-      return(StatusCode::FAILURE);
+   }
+   catch (const std::exception& ex) {
+    AthenaPoolCnvSvc::throwExcCaughtException (__PRETTY_FUNCTION__,
+                                               "pooltoObject",
+                                               ex,
+                                               typeid(P),
+                                               token->toString());
    }
    if (voidPtr == nullptr) {
       ATH_MSG_ERROR("poolToObject: Could not get object for Token = " << (token != nullptr ? token->toString() : ""));

Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.icc

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file T_AthenaPoolCustomCnv.icc
@@ -16,6 +16,7 @@
 
 #include "AthenaKernel/StorableConversions.h"
 
+#include "AthenaPoolCnvSvc/exceptions.h"
 #include "AthenaPoolCnvTPExtension.h"
 
 #include <sstream>
@@ -44,9 +45,13 @@ StatusCode T_AthenaPoolCustomCnvWithKey<TRANS, PERS>::DataObjectToPool(IOpaqueAd
    }
    try {
      persObj = createPersistentWithKey(obj, pObj->name());
-   } catch (std::exception &e) {
-      ATH_MSG_ERROR("Failed to create persistent object: " << e.what());
-      return(StatusCode::FAILURE);
+   }
+   catch (const std::exception& ex) {
+    AthenaPoolCnvSvc::throwExcCaughtException (__PRETTY_FUNCTION__,
+                                               "creating persistent object",
+                                               ex,
+                                               typeid(TRANS),
+                                               pObj->name());
    }
    Token* token = nullptr;
    StatusCode status = this->objectToPool(persObj, token, pObj->name(), *pAddr->par());
@@ -92,13 +97,13 @@ T_AthenaPoolCustomCnvWithKey<TRANS, PERS>::PoolToDataObject(DataObject*& pObj,
    }
    try {
       transObj = createTransientWithKey(key);
-   } catch(std::exception &e) {
-      ATH_MSG_ERROR("Failed to convert persistent object to transient: " << e.what());
-      // cleanup
-      if (extCnv != nullptr) {
-         extCnv->deletePersistentObjects();
-      }
-      return(StatusCode::FAILURE);
+   }
+   catch(const std::exception& ex) {
+    AthenaPoolCnvSvc::throwExcCaughtException (__PRETTY_FUNCTION__,
+                                               "creating transient object",
+                                               ex,
+                                               typeid(TRANS),
+                                               key);
    }
    if (extCnv != nullptr) {
       extCnv->deletePersistentObjects();

Database/AthenaPOOL/AthenaPoolCnvSvc/AthenaPoolCnvSvc/exceptions.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file AthenaPoolCnvSvc/exceptions.h
  * @author scott snyder <snyder@bnl.gov>
@@ -73,11 +72,54 @@ public:
  * @brief Throw a AthenaPoolCnvSvc::ExcUnsupportedVersion exception.
  * @param ti The class being read.
  * @param guid The GUID of the persistent class.
-o */
+ */
 [[noreturn]]
 void throwExcUnsupportedVersion (const std::type_info& ti, const Guid& guid);
 
   
+/**
+ * @brief Exception --- Caught an exception during conversion.
+ *
+ * Encountered an exception during conversion.
+ */
+class ExcCaughtException
+  : public std::runtime_error
+{
+public:
+  /**
+   * @brief Constructor.
+   * @param fnname Name of the function being executed.
+   * @param action What we were doing when we caught the exception.
+   * @param ex The caught exception.
+   * @param ti The class being thinned.
+   * @param key Key of the class being thinned.
+   */
+  ExcCaughtException (const char* fnname,
+                      const char* action,
+                      const std::exception& ex,
+                      const std::type_info& ti,
+                      const std::string& key);
+};
+
+
+/**
+ * @brief Throw a AthenaPoolCnvSvc::ExcCaughtException exception.
+ * @param fnname Name of the function being executed.
+ * @param action What we were doing when we caught the exception.
+ * @param ex The caught exception.
+ * @param ti The class being thinned.
+ * @param key Key of the class being thinned.
+ *
+ * Will also print a stack trace if exctrace is enabled.
+ */
+[[noreturn]]
+void throwExcCaughtException (const char* fnname,
+                              const char* action,
+                              const std::exception& ex,
+                              const std::type_info& ti,
+                              const std::string& key);
+
+  
 } // namespace AthenaPoolCnvSvc
 
 

Database/AthenaPOOL/AthenaPoolCnvSvc/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AthenaPoolCnvSvc )
@@ -49,22 +49,26 @@ atlas_add_test( T_AthenaPoolCreateFuncs_test
 atlas_add_test( T_AthenaPoolViewVectorCnv_test
    SOURCES test/T_AthenaPoolViewVectorCnv_test.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools )
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools
+   LOG_IGNORE_PATTERN "basic_string" )
 
 atlas_add_test( T_AthenaPoolxAODCnv_test
    SOURCES test/T_AthenaPoolxAODCnv_test.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools )
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools
+   LOG_IGNORE_PATTERN "basic_string" )
 
 atlas_add_test( T_AthenaPoolAuxContainerCnv_test
    SOURCES test/T_AthenaPoolAuxContainerCnv_test.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools )
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools
+   LOG_IGNORE_PATTERN "basic_string" )
 
 atlas_add_test( T_AthenaPoolTPCnvCnv_test
    SOURCES test/T_AthenaPoolTPCnvCnv_test.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools )
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TestTools
+   LOG_IGNORE_PATTERN "basic_string" )
 
 atlas_add_test( T_AuxContainerCopyTPCnv_test
    SOURCES test/T_AuxContainerCopyTPCnv_test.cxx

Database/AthenaPOOL/AthenaPoolCnvSvc/share/T_AthenaPoolAuxContainerCnv_test.ref

 
 
-Initializing Gaudi ApplicationMgr using job opts ../share/test.txt
-JobOptionsSvc        INFO Job options successfully read in from ../share/test.txt
+Initializing Gaudi ApplicationMgr using job opts /home/sss/atlas/dvtest/build/joboptions/AthenaPoolCnvSvc/test.txt
+JobOptionsSvc        INFO Job options successfully read in from /home/sss/atlas/dvtest/build/joboptions/AthenaPoolCnvSvc/test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
-                                          running on karma on Thu Jan 21 14:08:47 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Thu Mar 25 17:20:07 2021
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
-HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
 test1
 test2
-AthenaPoolConve...  ERROR Failed to convert persistent object to transient: AthenaPoolCnvSvc::::ExcUnsupported version: Unsupported persistent version of AthenaPoolCnvSvcTest::YAuxCont_v2 found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA
-AthenaPoolConve...  ERROR createObj PoolToDataObject() failed, Token = [DB=00000000-0000-0000-0000-000000000000][CNT=][CLID=8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA][TECH=00000000][OID=FFFFFFFFFFFFFFFF-FFFFFFFFFFFFFFFF]
+Exception: AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of AthenaPoolCnvSvcTest::YAuxCont_v2 found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA (no backtrace available).
+AthenaPoolConve...  ERROR createObj - caught exception: AthenaPoolCnvSvc::::ExcCaughtException: Caught exception in StatusCode T_AthenaPoolCustomCnvWithKey<TRANS, PERS>::PoolToDataObject(DataObject*&, const Token*, const string&) [with TRANS = AthenaPoolCnvSvcTest::YAuxCont_v2; PERS = AthenaPoolCnvSvcTest::YAuxCont_v2; std::string = std::__cxx11::basic_string<char>] while creating transient objectAthenaPoolCnvSvcTest::YAuxCont_v2/: AthenaPoolCnvSvc::ExcUnsupportedVersion: AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of AthenaPoolCnvSvcTest::YAuxCont_v2 found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA
 AthenaPoolConve...  ERROR createObj failed to get DataObject, Token = [DB=00000000-0000-0000-0000-000000000000][CNT=][CLID=8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA][TECH=00000000][OID=FFFFFFFFFFFFFFFF-FFFFFFFFFFFFFFFF]

Database/AthenaPOOL/AthenaPoolCnvSvc/share/T_AthenaPoolTPCnvCnv_test.ref

 
 
-Initializing Gaudi ApplicationMgr using job opts ../share/test.txt
-JobOptionsSvc        INFO Job options successfully read in from ../share/test.txt
+Initializing Gaudi ApplicationMgr using job opts /home/sss/atlas/dvtest/build/joboptions/AthenaPoolCnvSvc/test.txt
+JobOptionsSvc        INFO Job options successfully read in from /home/sss/atlas/dvtest/build/joboptions/AthenaPoolCnvSvc/test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
-                                          running on karma on Fri Jan 22 14:26:54 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Thu Mar 25 17:19:52 2021
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
-HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
 test1
 test2
-AthenaPoolConve...  ERROR Failed to convert persistent object to transient: AthenaPoolCnvSvc::::ExcUnsupported version: Unsupported persistent version of DataVector<AthenaPoolCnvSvcTest::X,DataModel_detail::NoBase> found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA
-AthenaPoolConve...  ERROR createObj PoolToDataObject() failed, Token = [DB=00000000-0000-0000-0000-000000000000][CNT=][CLID=8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA][TECH=00000000][OID=FFFFFFFFFFFFFFFF-FFFFFFFFFFFFFFFF]
+Exception: AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of DataVector<AthenaPoolCnvSvcTest::X,DataModel_detail::NoBase> found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA (no backtrace available).
+AthenaPoolConve...  ERROR createObj - caught exception: AthenaPoolCnvSvc::::ExcCaughtException: Caught exception in StatusCode T_AthenaPoolCustomCnvWithKey<TRANS, PERS>::PoolToDataObject(DataObject*&, const Token*, const string&) [with TRANS = DataVector<AthenaPoolCnvSvcTest::X>; PERS = AthenaPoolCnvSvcTest::XCont_p2; std::string = std::__cxx11::basic_string<char>] while creating transient objectDataVector<AthenaPoolCnvSvcTest::X,DataModel_detail::NoBase>/: AthenaPoolCnvSvc::ExcUnsupportedVersion: AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of DataVector<AthenaPoolCnvSvcTest::X,DataModel_detail::NoBase> found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA
 AthenaPoolConve...  ERROR createObj failed to get DataObject, Token = [DB=00000000-0000-0000-0000-000000000000][CNT=][CLID=8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA][TECH=00000000][OID=FFFFFFFFFFFFFFFF-FFFFFFFFFFFFFFFF]

Database/AthenaPOOL/AthenaPoolCnvSvc/share/T_AthenaPoolViewVectorCnv_test.ref

 
 
-Initializing Gaudi ApplicationMgr using job opts ../share/test.txt
-JobOptionsSvc        INFO Job options successfully read in from ../share/test.txt
+Initializing Gaudi ApplicationMgr using job opts /home/sss/atlas/dvtest/build/joboptions/AthenaPoolCnvSvc/test.txt
+JobOptionsSvc        INFO Job options successfully read in from /home/sss/atlas/dvtest/build/joboptions/AthenaPoolCnvSvc/test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Mon Oct 10 19:17:16 2016
+                                          running on karma on Thu Mar 25 17:22:26 2021
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
-HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
 test1
-AthenaPoolConve...  ERROR Failed to convert persistent object to transient: AthenaPoolCnvSvc::::ExcUnsupported version: Unsupported persistent version of ViewVector<DataVector<AthenaPoolCnvSvcTest::Y_v2,DataModel_detail::NoBase> > found; guid: 79E2478D-C17F-45E9-848D-278240C2FED3
-AthenaPoolConve...  ERROR createObj PoolToDataObject() failed, Token = [DB=00000000-0000-0000-0000-000000000000][CNT=][CLID=79E2478D-C17F-45E9-848D-278240C2FED3][TECH=00000000][OID=FFFFFFFFFFFFFFFF-FFFFFFFFFFFFFFFF]
+Exception: AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of ViewVector<DataVector<AthenaPoolCnvSvcTest::Y_v2,DataModel_detail::NoBase> > found; guid: 79E2478D-C17F-45E9-848D-278240C2FED3 (no backtrace available).
+AthenaPoolConve...  ERROR createObj - caught exception: AthenaPoolCnvSvc::::ExcCaughtException: Caught exception in StatusCode T_AthenaPoolCustomCnvWithKey<TRANS, PERS>::PoolToDataObject(DataObject*&, const Token*, const string&) [with TRANS = ViewVector<DataVector<AthenaPoolCnvSvcTest::Y_v2> >; PERS = ViewVector<DataVector<AthenaPoolCnvSvcTest::Y_v2> >; std::string = std::__cxx11::basic_string<char>] while creating transient objectViewVector<DataVector<AthenaPoolCnvSvcTest::Y_v2,DataModel_detail::NoBase> >/: AthenaPoolCnvSvc::ExcUnsupportedVersion: AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of ViewVector<DataVector<AthenaPoolCnvSvcTest::Y_v2,DataModel_detail::NoBase> > found; guid: 79E2478D-C17F-45E9-848D-278240C2FED3
 AthenaPoolConve...  ERROR createObj failed to get DataObject, Token = [DB=00000000-0000-0000-0000-000000000000][CNT=][CLID=79E2478D-C17F-45E9-848D-278240C2FED3][TECH=00000000][OID=FFFFFFFFFFFFFFFF-FFFFFFFFFFFFFFFF]
 test2

Database/AthenaPOOL/AthenaPoolCnvSvc/share/T_AthenaPoolxAODCnv_test.ref

 
 
-Initializing Gaudi ApplicationMgr using job opts ../share/test.txt
-JobOptionsSvc        INFO Job options successfully read in from ../share/test.txt
+Initializing Gaudi ApplicationMgr using job opts /home/sss/atlas/dvtest/build/joboptions/AthenaPoolCnvSvc/test.txt
+JobOptionsSvc        INFO Job options successfully read in from /home/sss/atlas/dvtest/build/joboptions/AthenaPoolCnvSvc/test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Wed Oct 16 11:26:09 2019
+                                          running on karma on Thu Mar 25 17:21:54 2021
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
-HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
 test1
-AthenaPoolConve...  ERROR Failed to convert persistent object to transient: AthenaPoolCnvSvc::::ExcUnsupported version: Unsupported persistent version of DataVector<AthenaPoolCnvSvcTest::Y_v2,DataModel_detail::NoBase> found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA
-AthenaPoolConve...  ERROR createObj PoolToDataObject() failed, Token = [DB=00000000-0000-0000-0000-000000000000][CNT=][CLID=8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA][TECH=00000000][OID=FFFFFFFFFFFFFFFF-FFFFFFFFFFFFFFFF]
+Exception: AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of DataVector<AthenaPoolCnvSvcTest::Y_v2,DataModel_detail::NoBase> found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA (no backtrace available).
+AthenaPoolConve...  ERROR createObj - caught exception: AthenaPoolCnvSvc::::ExcCaughtException: Caught exception in StatusCode T_AthenaPoolCustomCnvWithKey<TRANS, PERS>::PoolToDataObject(DataObject*&, const Token*, const string&) [with TRANS = DataVector<AthenaPoolCnvSvcTest::Y_v2>; PERS = DataVector<AthenaPoolCnvSvcTest::Y_v2>; std::string = std::__cxx11::basic_string<char>] while creating transient objectDataVector<AthenaPoolCnvSvcTest::Y_v2,DataModel_detail::NoBase>/key: AthenaPoolCnvSvc::ExcUnsupportedVersion: AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of DataVector<AthenaPoolCnvSvcTest::Y_v2,DataModel_detail::NoBase> found; guid: 8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA
 AthenaPoolConve...  ERROR createObj failed to get DataObject, Token = [DB=00000000-0000-0000-0000-000000000000][CNT=][CLID=8ACD1C53-D3C7-4FE5-9BC0-E388701DB8FA][TECH=00000000][OID=FFFFFFFFFFFFFFFF-FFFFFFFFFFFFFFFF]
 test2

Database/AthenaPOOL/AthenaPoolCnvSvc/share/exceptions_test.ref

 test1
 AthenaPoolCnvSvc::::ExcNoDictForClass: Can't find dictionary information for class: int
-AthenaPoolCnvSvc::::ExcUnsupported version: Unsupported persistent version of int found; guid: 336F636C-D414-4261-8286-37429F353F0A
+AthenaPoolCnvSvc::::ExcUnsupportedVersion: Unsupported persistent version of int found; guid: 336F636C-D414-4261-8286-37429F353F0A
+AthenaPoolCnvSvc::::ExcCaughtException: Caught exception in fnname while chasing my tailint/key: std::runtime_error: foofoo

Database/AthenaPOOL/AthenaPoolCnvSvc/src/exceptions.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file AthenaPoolCnvSvc/src/exceptions.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -12,6 +11,7 @@
 
 
 #include "AthenaPoolCnvSvc/exceptions.h"
+#include "CxxUtils/exctrace.h"
 #include "GaudiKernel/System.h"
 #include <sstream>
 
@@ -58,7 +58,7 @@ std::string excUnsupportedVersion_format (const std::type_info& ti,
                                           const Guid& guid)
 {
   std::ostringstream os;
-  os << "AthenaPoolCnvSvc::::ExcUnsupported version: "
+  os << "AthenaPoolCnvSvc::::ExcUnsupportedVersion: "
      << "Unsupported persistent version of "
      << System::typeinfoName(ti)
      << " found; guid: " << guid.toString();
@@ -89,4 +89,65 @@ void throwExcUnsupportedVersion (const std::type_info& ti, const Guid& guid)
 }
 
 
+//*************************************************************************
+
+
+/// Helper: format exception error string.
+std::string excCaughtException_format (const char* fnname,
+                                       const char* action,
+                                       const std::exception& ex,
+                                       const std::type_info& ti,
+                                       const std::string& key)
+{
+  std::ostringstream os;
+  os << "AthenaPoolCnvSvc::::ExcCaughtException: "
+     << "Caught exception in " << fnname
+     << " while " << action
+     << System::typeinfoName(ti) << "/" << key
+     << ": " << System::typeinfoName(typeid(ex)) << ": " << ex.what();
+  return os.str();
+}
+
+
+/**
+ * @brief Constructor.
+ * @param fnname Name of the function being executed.
+ * @param action What we were doing when we caught the exception.
+ * @param ex The caught exception.
+ * @param ti The class being thinned.
+ * @param key Key of the class being thinned.
+ */
+ExcCaughtException::ExcCaughtException (const char* fnname,
+                                        const char* action,
+                                        const std::exception& ex,
+                                        const std::type_info& ti,
+                                        const std::string& key)
+  : std::runtime_error (excCaughtException_format (fnname, action, ex, ti, key))
+{
+}
+
+
+/**
+ * @brief Throw a AthenaPoolCnvSvc::ExcCaughtException exception.
+ * @param fnname Name of the function being executed.
+ * @param action What we were doing when we caught the exception.
+ * @param ex The caught exception.
+ * @param ti The class being thinned.
+ * @param key Key of the class being thinned.
+ *
+ * Will also print a stack trace if exctrace is enabled.
+ */
+void throwExcCaughtException (const char* fnname,
+                              const char* action,
+                              const std::exception& ex,
+                              const std::type_info& ti,
+                              const std::string& key)
+{
+  std::cout.flush();
+  std::cerr.flush();
+  CxxUtils::exctrace (ex);
+  throw ExcCaughtException (fnname, action, ex, ti, key);
+}
+
+
 } // namespace AthenaPoolCnvSvc

Database/AthenaPOOL/AthenaPoolCnvSvc/test/exceptions_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file AthenaPoolCnvSvc/test/exceptions_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -25,6 +24,12 @@ void test1()
   std::cout << AthenaPoolCnvSvc::ExcUnsupportedVersion
     ( typeid(int),
       Guid("336F636C-D414-4261-8286-37429F353F0A") ).what() << "\n";
+  std::cout << AthenaPoolCnvSvc::ExcCaughtException
+    ( "fnname",
+      "chasing my tail",
+      std::runtime_error ("foofoo"),
+      typeid(int),
+      "key").what() << "\n";
 }
 
 

Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref

+Tue Mar 30 10:39:50 CDT 2021
+Preloading tcmalloc_minimal.so
+Athena               INFO including file "AthenaCommon/Preparation.py"
+Athena               INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Athena               INFO executing ROOT6Setup
+Athena               INFO including file "AthenaCommon/Execution.py"
+Athena               INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_RCondJobOptions.py"
+Py:ConfigurableDb    INFO Read module info for 5121 configurables from 59 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+Athena               INFO including file "AthenaCommon/runbatch.py"
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v35r1)
+                                          running on hepd-0003 on Tue Mar 30 10:39:57 2021
+====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
+ClassIDSvc           INFO  getRegistryEntries: read 3200 CLIDRegistry entries for module ALL
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 861 CLIDRegistry entries for module ALL
+ReadCond            DEBUG Property update for OutputLevel : new value = 2
 ReadCond             INFO in initialize()
+ReadCond            DEBUG input handles: 0
+ReadCond            DEBUG output handles: 0
+ReadCond            DEBUG Data Deps for ReadCond
+ReadData            DEBUG Property update for OutputLevel : new value = 2
 ReadData             INFO in initialize()
+MetaDataSvc         DEBUG Property update for OutputLevel : new value = 2
+MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
+MetaDataSvc         DEBUG Service base class initialized successfully
+PoolSvc             DEBUG Property update for OutputLevel : new value = 2
+PoolSvc             DEBUG Service base class initialized successfully
+PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
+PoolSvc              INFO Frontier compression level set to 5
+DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc         INFO Read replica configuration from /home/gemmeren/workarea/build/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 1 servers found for host hepd-0003.lcrc.anl.gov [ATLF ]
+PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
+PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc             DEBUG POOL ReadCatalog is file:Catalog0.xml
 PoolSvc             DEBUG POOL ReadCatalog is file:Catalog1.xml
+PoolSvc              INFO POOL WriteCatalog is file:Catalog2.xml
+DbSession            INFO     Open     DbSession    
+Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
+MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool'])
+EventSelector       DEBUG Property update for OutputLevel : new value = 2
 EventSelector       DEBUG Initializing EventSelector
+EventSelector       DEBUG Service base class initialized successfully
 EventSelector       DEBUG reinitialization...
 EventSelector        INFO EventSelection with query 
 EventSelector       DEBUG Try item: "SimplePoolFile1.root" from the collection list.
 PoolSvc             DEBUG createCollection() type=RootCollection, connection=PFN:SimplePoolFile1.root, name=SimplePoolFile1.root, contextID=0
 MetaDataSvc         DEBUG handle() FirstInputFile for FID:????
 MetaDataSvc         DEBUG initInputMetaDataStore: file name FID:????
+Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] ????
+Domain[ROOT_All]     INFO                           SimplePoolFile1.root
 SimplePoolFile1...  DEBUG --> Access   DbContainer  READ      [ROOT_All] ##Shapes
 ##Shapes            DEBUG Opening
 ##Shapes            DEBUG    attributes# = 1
@@ -112,18 +154,33 @@ MetaDataHdr(Dat...  DEBUG Opening
 MetaDataHdr(Dat...  DEBUG    attributes# = 1
 MetaDataHdr(Dat...  DEBUG Branch container 'DataHeader'
 MetaDataHdr(Dat...  DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
+ClassIDSvc           INFO  getRegistryEntries: read 1710 CLIDRegistry entries for module ALL
+EventPersistenc...   INFO Added successfully Conversion service:AthenaPoolCnvSvc
 SimplePoolFile1...  DEBUG --> Access   DbContainer  READ      [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
 MetaDataHdrForm...  DEBUG Opening
 MetaDataHdrForm...  DEBUG    attributes# = 1
 MetaDataHdrForm...  DEBUG Branch container 'DataHeaderForm'
 MetaDataHdrForm...  DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
 MetaDataSvc         DEBUG Loaded input meta data store proxies
+ClassIDSvc           INFO  getRegistryEntries: read 2 CLIDRegistry entries for module ALL
+OutputStreamSeq...   INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
 MetaDataSvc         DEBUG Registering all Tools in ToolHandleArray MetaDataTools
 MetaDataSvc         DEBUG Adding public ToolHandle tool ToolSvc.IOVDbMetaDataTool (IOVDbMetaDataTool)
+MetaDataSvc          INFO   AlgTool: ToolSvc.IOVDbMetaDataTool
+AthenaPoolAddre...  DEBUG Property update for OutputLevel : new value = 2
+AthenaPoolAddre...  DEBUG Service base class initialized successfully
+CondProxyProvider   DEBUG Property update for OutputLevel : new value = 2
+CondProxyProvider    INFO Initializing CondProxyProvider - package version EventSelectorAthenaPool-00-00-00
+CondProxyProvider   DEBUG Service base class initialized successfully
 CondProxyProvider    INFO Inputs: SimplePoolFile4.root
 CondProxyProvider   DEBUG Try item: "SimplePoolFile4.root" from the collection list.
-PoolSvc             DEBUG createCollection() type=RootCollection, connection=PFN:SimplePoolFile4.root, name=SimplePoolFile4.root, contextID=0
-PoolSvc             DEBUG createCollection() type=ImplicitCollection, connection=PFN:SimplePoolFile4.root, name=POOLContainer(DataHeader), contextID=0
+PoolSvc             DEBUG createCollection() type=RootCollection, connection=PFN:SimplePoolFile4.root, name=SimplePoolFile4.root, contextID=2
+PoolSvc             DEBUG createCollection() type=ImplicitCollection, connection=PFN:SimplePoolFile4.root, name=POOLContainer(DataHeader), contextID=2
+PersistencySvc:...  DEBUG lookupPFN: SimplePoolFile4.root returned FID: '????' tech=ROOT_All
+DbSession            INFO     Open     DbSession    
+Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
+Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] ????
+Domain[ROOT_All]     INFO                           SimplePoolFile4.root
 SimplePoolFile4...  DEBUG --> Access   DbContainer  READ      [ROOT_All] ##Shapes
 ##Shapes            DEBUG Opening
 ##Shapes            DEBUG    attributes# = 1
@@ -157,6 +214,9 @@ SimplePoolFile4...  DEBUG --->Reading Param:PFN=[SimplePoolFile4.root]
 SimplePoolFile4...  DEBUG --->Reading Param:POOL_VSN=[1.1]
 SimplePoolFile4...  DEBUG --->Reading Param:FORMAT_VSN=[1.1]
 ##Params            DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+ReadData            DEBUG input handles: 2
+ReadData            DEBUG output handles: 0
+ReadData            DEBUG Data Deps for ReadData
   + INPUT   ( 'ExampleHitContainer' , 'StoreGateSvc+MyHits' ) 
   + INPUT   ( 'ExampleTrackContainer' , 'StoreGateSvc+MyTracks' ) 
 AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
@@ -190,6 +250,7 @@ POOLContainerFo...  DEBUG Opened container POOLContainerForm(DataHeaderForm) of
 AthenaPoolAddre...  DEBUG The current Event contains: 3 objects
 AthenaPoolAddre...  DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
 AthenaPoolAddre...  DEBUG loadAddresses: DataObject address, clid = 9102, name = MyHits
+AlgResourcePool      INFO TopAlg list empty. Recovering the one of Application Manager
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #0, run #1 0 events processed so far  <<<===
 ReadCond            DEBUG in execute()
@@ -199,8 +260,15 @@ POOLContainer(D...  DEBUG Opening
 POOLContainer(D...  DEBUG    attributes# = 1
 POOLContainer(D...  DEBUG Branch container 'DataHeader'
 POOLContainer(D...  DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-StorageSvc          DEBUG Disconnect request for database: FID=???? PFN=SimplePoolFile4.root
-StorageSvc          DEBUG Closing database: FID=????
+SimplePoolFile4...  DEBUG --> Access   DbContainer  READ      [ROOT_Tree] POOLContainerForm(DataHeaderForm)
+POOLContainerFo...  DEBUG Opening
+POOLContainerFo...  DEBUG    attributes# = 1
+POOLContainerFo...  DEBUG Branch container 'DataHeaderForm'
+POOLContainerFo...  DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
+CondProxyProvider   DEBUG The current File contains: 2 objects
+CondProxyProvider   DEBUG preLoadAddresses: DataObject address, clid = 9102, name = PedestalWriteData
+Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] ????
+Domain[ROOT_All]     INFO                           SimplePoolFile4.root
 SimplePoolFile4...  DEBUG --> Access   DbContainer  READ      [ROOT_All] ##Shapes
 ##Shapes            DEBUG Opening
 ##Shapes            DEBUG    attributes# = 1
@@ -234,18 +302,6 @@ SimplePoolFile4...  DEBUG --->Reading Param:PFN=[SimplePoolFile4.root]
 SimplePoolFile4...  DEBUG --->Reading Param:POOL_VSN=[1.1]
 SimplePoolFile4...  DEBUG --->Reading Param:FORMAT_VSN=[1.1]
 ##Params            DEBUG No objects passing selection criteria... Container has 4 Entries in total.
-SimplePoolFile4...  DEBUG --> Access   DbContainer  READ      [ROOT_Tree] POOLContainer(DataHeader)
-POOLContainer(D...  DEBUG Opening
-POOLContainer(D...  DEBUG    attributes# = 1
-POOLContainer(D...  DEBUG Branch container 'DataHeader'
-POOLContainer(D...  DEBUG Opened container POOLContainer(DataHeader) of type ROOT_Tree
-SimplePoolFile4...  DEBUG --> Access   DbContainer  READ      [ROOT_Tree] POOLContainerForm(DataHeaderForm)
-POOLContainerFo...  DEBUG Opening
-POOLContainerFo...  DEBUG    attributes# = 1
-POOLContainerFo...  DEBUG Branch container 'DataHeaderForm'
-POOLContainerFo...  DEBUG Opened container POOLContainerForm(DataHeaderForm) of type ROOT_Tree
-CondProxyProvider   DEBUG The current File contains: 2 objects
-CondProxyProvider   DEBUG preLoadAddresses: DataObject address, clid = 9102, name = PedestalWriteData
 SimplePoolFile4...  DEBUG --> Access   DbContainer  READ      [ROOT_Tree] ConditionsContainerExampleHitContainer_p1(PedestalWriteData)
 ConditionsConta...  DEBUG Opening
 ConditionsConta...  DEBUG    attributes# = 1
@@ -288,6 +344,7 @@ EventSelector       DEBUG Get AttributeList from the collection
 EventSelector       DEBUG AttributeList size 12
 EventSelector       DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
 EventSelector       DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001].
+ClassIDSvc           INFO  getRegistryEntries: read 21 CLIDRegistry entries for module ALL
 EventSelector       DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=00000203][OID=00000005-00000001]
 AthenaPoolAddre...  DEBUG The current Event contains: 3 objects
 AthenaPoolAddre...  DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
@@ -913,25 +970,37 @@ ReadData             INFO Hit x = 1930.12 y = 46.5449 z = -1856.17 detector = Du
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #19, run #1 20 events processed so far  <<<===
 MetaDataSvc         DEBUG handle() EndInputFile for FID:????
 MetaDataSvc         DEBUG retireMetadataSource: FID:????
+EventSelector        INFO Disconnecting input sourceID: ????
 StorageSvc          DEBUG Disconnect request for database: FID=???? PFN=SimplePoolFile1.root
 StorageSvc          DEBUG Closing database: FID=????
+Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] ????
 AthenaEventLoopMgr   INFO No more events in event selection 
 MetaDataSvc         DEBUG MetaDataSvc::stop()
 PoolSvc             DEBUG Disconnect request for contextId=0
 StorageSvc          DEBUG Disconnect request for database: FID=???? PFN=SimplePoolFile4.root
 StorageSvc          DEBUG Closing database: FID=????
+Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] ????
+Domain[ROOT_All]     INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 PoolSvc             DEBUG Disconnected PersistencySvc session
 PoolSvc             DEBUG Disconnect request for contextId=1
 PoolSvc             DEBUG Disconnect request for contextId=2
+StorageSvc          DEBUG Disconnect request for database: FID=???? PFN=SimplePoolFile4.root
+StorageSvc          DEBUG Closing database: FID=????
+Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] ????
+Domain[ROOT_All]     INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 PoolSvc             DEBUG Disconnected PersistencySvc session
 ApplicationMgr       INFO Application Manager Stopped successfully
 ReadCond             INFO in finalize()
 ReadData             INFO in finalize()
+ReadData            DEBUG Calling destructor
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
+cObjR_ALL            INFO Time User   : Tot=    0 [us] Ave/Min/Max=       0(+-       0)/       0/       0 [us] #= 49
+cObj_ALL             INFO Time User   : Tot=   10 [ms] Ave/Min/Max=   0.222(+-    1.47)/       0/      10 [ms] #= 45
+ChronoStatSvc        INFO Time User   : Tot=  170 [ms]  #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully

Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.cxx

@@ -31,7 +31,8 @@
 CondProxyProvider::CondProxyProvider(const std::string& name, ISvcLocator* pSvcLocator) :
 	::AthService(name, pSvcLocator),
 	m_athenaPoolCnvSvc("AthenaPoolCnvSvc", name),
-	m_poolCollectionConverter(0)
+	m_poolCollectionConverter(0),
+	m_contextId(IPoolSvc::kInputStream)
 	{
 }
 //________________________________________________________________________________
@@ -55,8 +56,8 @@ StatusCode CondProxyProvider::initialize() {
    }
    // Get PoolSvc and connect as "Conditions"
    IPoolSvc *poolSvc = m_athenaPoolCnvSvc->getPoolSvc();
-   StatusCode status = poolSvc->connect( pool::ITransaction::READ,
-                                         poolSvc->getInputContext("Conditions") );
+   m_contextId = poolSvc->getInputContext("Conditions");
+   StatusCode status = poolSvc->connect( pool::ITransaction::READ, m_contextId );
    if (!status.isSuccess()) {
       ATH_MSG_FATAL("Cannot connect to Database.");
       return(StatusCode::FAILURE);
@@ -131,7 +132,7 @@ StatusCode CondProxyProvider::preLoadAddresses(StoreID::type storeID,
       SG::VersionedKey myVersKey(name(), verNumber);
       Token* token = new Token;
       token->fromString(headerIterator->eventRef().toString());
-      TokenAddress* tokenAddr = new TokenAddress(POOL_StorageType, ClassID_traits<DataHeader>::ID(), "", myVersKey, IPoolSvc::kInputStream, token);
+      TokenAddress* tokenAddr = new TokenAddress(POOL_StorageType, ClassID_traits<DataHeader>::ID(), "", myVersKey, m_contextId, token);
       if (!detectorStoreSvc->recordAddress(tokenAddr).isSuccess()) {
          ATH_MSG_ERROR("Cannot record DataHeader.");
          return(StatusCode::FAILURE);
@@ -178,6 +179,7 @@ PoolCollectionConverter* CondProxyProvider::getCollectionCnv() {
    ATH_MSG_DEBUG("Try item: \"" << *m_inputCollectionsIterator << "\" from the collection list.");
    PoolCollectionConverter* pCollCnv = new PoolCollectionConverter("ImplicitROOT",
 	   *m_inputCollectionsIterator,
+	   m_contextId,
 	   "",
 	   m_athenaPoolCnvSvc->getPoolSvc());
    if (!pCollCnv->initialize().isSuccess()) {

Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h

@@ -59,6 +59,7 @@ private: // data
    ServiceHandle<IAthenaPoolCnvSvc> m_athenaPoolCnvSvc;
 
    mutable PoolCollectionConverter* m_poolCollectionConverter ATLAS_THREAD_SAFE;
+   unsigned int m_contextId;
 
 private: // properties
    /// InputCollections, vector with names of the input collections.

Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx

@@ -780,6 +780,7 @@ StatusCode EventSelectorAthenaPool::seek(Context& /*ctxt*/, int evtNum) const {
          m_inputCollectionsIterator += m_curCollection;
          m_poolCollectionConverter = new PoolCollectionConverter(m_collectionType.value() + ":" + m_collectionTree.value(),
 	         m_inputCollectionsProp.value()[m_curCollection],
+	         IPoolSvc::kInputStream,
 	         m_query.value(),
 	         m_athenaPoolCnvSvc->getPoolSvc());
          if (!m_poolCollectionConverter->initialize().isSuccess()) {
@@ -827,6 +828,7 @@ int EventSelectorAthenaPool::findEvent(int evtNum) const {
       if (m_numEvt[i] == -1) {
          PoolCollectionConverter pcc(m_collectionType.value() + ":" + m_collectionTree.value(),
 	         m_inputCollectionsProp.value()[i],
+	         IPoolSvc::kInputStream,
 	         m_query.value(),
 	         m_athenaPoolCnvSvc->getPoolSvc());
          if (!pcc.initialize().isSuccess()) {
@@ -981,6 +983,7 @@ PoolCollectionConverter* EventSelectorAthenaPool::getCollectionCnv(bool throwInc
       ATH_MSG_DEBUG("Try item: \"" << *m_inputCollectionsIterator << "\" from the collection list.");
       PoolCollectionConverter* pCollCnv = new PoolCollectionConverter(m_collectionType.value() + ":" + m_collectionTree.value(),
 	      *m_inputCollectionsIterator,
+	      IPoolSvc::kInputStream,
 	      m_query.value(),
 	      m_athenaPoolCnvSvc->getPoolSvc());
       StatusCode status = pCollCnv->initialize();