Skip to content
Snippets Groups Projects
Commit 01346bc9 authored by Peter Van Gemmeren's avatar Peter Van Gemmeren Committed by Graeme Stewart
Browse files

disable SealSvc dictionary checks for ROOT6 (AthenaPoolCnvSvc-00-26-18)

	* src/AthenaPoolCnvSvc.cxx: disable SealSvc dictionary checks for ROOT6
	* tag AthenaPoolCnvSvc-00-26-18

2014-10-20 Will Buttinger <will@cern.ch>
      * python/AthenaPool.py : when in AthAnalysisBase project, changed PoolSvc output level to ERROR, to hide warnings about missing reflex types
      * tag AthenaPoolCnvSvc-00-26-17

2014-09-23  Marcin Nowak  <Marcin.Nowak@cern.ch>
	* src\AthenaPoolCnvSvc.cxx: disable AthenaRootStreamerSvc for ROOT6
	* tag AthenaPoolCnvSvc-00-26-16

2014-09-23  scott snyder  <snyder@bnl.gov>

	* Tagging AthenaPoolCnvSvc-00-26-15.
	* cmt/requirements: Fix checkreq warning.
parent 8947d394
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,6 @@ author Peter Van Gemmeren <gemmeren@bnl.gov>
use AtlasPolicy AtlasPolicy-*
use AtlasPOOL AtlasPOOL-* External
use GaudiInterface GaudiInterface-* External
use AtlasReflex AtlasReflex-* External
use AthenaBaseComps AthenaBaseComps-* Control
use CLIDSvc CLIDSvc-* Control
use DataModel DataModel-* Control
......
......@@ -27,6 +27,11 @@ def _loadBasicAthenaPool():
msg.debug( "Loading basic services for AthenaPool..." )
svcMgr += CfgMgr.PoolSvc()
#if in AthAnalysisBase, we will set the outputlevel of PoolSvc to ERROR, to silence warnings about missing reflex types
#detect AthAnalysisBase by looking at the CMTEXTRATAGS env var, if it contains 'ManaCore' then we are in AthAnalysisBase
import os
from AthenaCommon.Constants import ERROR
if "ManaCore" in os.environ.get('CMTEXTRATAGS',""): svcMgr.PoolSvc.OutputLevel=ERROR
svcMgr += CfgMgr.AthenaPoolCnvSvc()
from AthenaCommon.AppMgr import theApp
......
......@@ -40,12 +40,14 @@ StatusCode AthenaPoolCnvSvc::initialize() {
ATH_MSG_FATAL("Cannot get DataModelCompatSvc.");
return(StatusCode::FAILURE);
}
#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
// Initialize AthenaRootStreamerSvc
ServiceHandle<IService> arssvc("AthenaRootStreamerSvc", this->name());
if (!arssvc.retrieve().isSuccess()) {
ATH_MSG_FATAL("Cannot get AthenaRootStreamerSvc.");
return(StatusCode::FAILURE);
}
#endif
// Retrieve ClassIDSvc
if (!m_clidSvc.retrieve().isSuccess()) {
ATH_MSG_FATAL("Cannot get ClassIDSvc.");
......@@ -438,7 +440,12 @@ void AthenaPoolCnvSvc::setObjPtr(void*& obj, const Token* token) const {
}
//______________________________________________________________________________
bool AthenaPoolCnvSvc::testDictionary(const std::string& className) const {
#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
return(m_poolSvc->testDictionary(className));
#else
ATH_MSG_DEBUG("Skipping Dictionary check for: " << className);
return(true);
#endif
}
//______________________________________________________________________________
bool AthenaPoolCnvSvc::useDetailChronoStat() const {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment