diff --git a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref index c1d593439c50e201a14be2db8ca3547e7afc4817..0d3321872ef999841639c6bb5036b927b296b22e 100644 --- a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref +++ b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref @@ -548,7 +548,7 @@ Now we expect to see an error message: recorded with key Const of type Foo (CLID 8101) in DataObject @0xffd390 <<---Error Message Ends------- IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event ClassIDSvc INFO getRegistryEntries: read 325 CLIDRegistry entries for module ALL *** StoreGateSvcClient_test records OK *** diff --git a/Calorimeter/CaloDetDescr/share/CaloSuperCellIDTool_test.ref b/Calorimeter/CaloDetDescr/share/CaloSuperCellIDTool_test.ref index a11f49f207c8a6a1f410aa2a69261c0ef319c5b0..19d3efa47fbe95764dd7e7233a53e649cb626c75 100644 --- a/Calorimeter/CaloDetDescr/share/CaloSuperCellIDTool_test.ref +++ b/Calorimeter/CaloDetDescr/share/CaloSuperCellIDTool_test.ref @@ -135,7 +135,7 @@ RalSessionMgr Info Start a read-only transaction active for the duration of the RelationalDatabase Info Instantiate a R/O RalDatabase for 'COOLOFL_LAR/OFLP200' RelationalDatabase Info Release number backward compatibility - NO SCHEMA EVOLUTION REQUIRED: database with OLDER release number 2.8.12 will be opened using CURRENT client release number 2.8.18 StoreGateSvc INFO Initializing StoreGateSvc - package version StoreGate-00-00-00 -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLONL_CALO/OFLP200 RalSessionMgr Info Instantiate a R/O RalSessionMgr for 'COOLONL_CALO/OFLP200' RalSessionMgr Info Connect to the database server diff --git a/Calorimeter/CaloUtils/CMakeLists.txt b/Calorimeter/CaloUtils/CMakeLists.txt index e50d518cde59e25f68abb86aa25bf2f54da26fdb..3ed078f248849f93ad4f568968060fa6c5c8dcda 100644 --- a/Calorimeter/CaloUtils/CMakeLists.txt +++ b/Calorimeter/CaloUtils/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id: CMakeLists.txt 730049 2016-03-15 14:19:51Z krasznaa $ ################################################################################ # Package: CaloUtils ################################################################################ @@ -83,12 +82,12 @@ atlas_add_test( CaloVertexedCluster_test atlas_add_test( CaloTowerStore_test SCRIPT test/CaloTowerStore_test.sh - EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConst.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|Cs Tube|XMLFileCatalog Info|No IOVSvcTool associated|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager|^CORAL/" + EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConst.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|Cs Tube|XMLFileCatalog Info|IOVSvcTool|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager|^CORAL/" PROPERTIES TIMEOUT 500 ) atlas_add_test( CaloTowerBuilderTool_test SCRIPT test/CaloTowerBuilderTool_test.sh - EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConstru.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|Cs Tube|XMLFileCatalog Info|No IOVSvcTool associated|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager|oracle Info|initialize_from_dictionary|Calo Detector Manager" + EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConstru.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|Cs Tube|XMLFileCatalog Info|IOVSvcTool|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager|oracle Info|initialize_from_dictionary|Calo Detector Manager" ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-10" PROPERTIES TIMEOUT 500 ) diff --git a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref index 298d197be90dbe2778c9f9e8fce430246c1074ab..9b1d235c344851adab3aae0de78e2bdb97a843dc 100644 --- a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref +++ b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref @@ -60,7 +60,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200 diff --git a/Control/IOVSvc/IOVSvc/IIOVSvcTool.h b/Control/IOVSvc/IOVSvc/IIOVSvcTool.h index a1b99de8e7b85aaa1a9fe88c758f94cf7bcbe835..6cdab3083263132dbd7b831700555a74267a93f8 100644 --- a/Control/IOVSvc/IOVSvc/IIOVSvcTool.h +++ b/Control/IOVSvc/IOVSvc/IIOVSvcTool.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #ifndef IOVSVC_IIOVSVCTOOL_H @@ -25,15 +25,7 @@ namespace SG { class IIOVSvcTool : virtual public IAlgTool { public: - - /// Retrieve interface ID - static const InterfaceID& interfaceID() { - // Declaration of the interface ID ( interface id, major ver, minor ver) - static const InterfaceID IID_IIOVSvcTool("IIOVSvcTool", 1 , 0); - return IID_IIOVSvcTool; - } - - + DeclareInterfaceID(IIOVSvcTool, 1, 0); virtual void setStoreName(const std::string& storeName) = 0; virtual const std::string& getStoreName() const = 0; @@ -100,8 +92,6 @@ public: virtual StatusCode getTriggeredTools(const std::string& key, std::set& tools) = 0; - virtual StatusCode reinitialize() = 0; - virtual bool holdsProxy( const SG::DataProxy* proxy ) const = 0; virtual bool holdsProxy( const CLID& clid, const std::string& key ) const = 0; virtual bool holdsCallback( const CallBackID& ) const = 0; diff --git a/Control/IOVSvc/share/IOVSvcTool_test.ref b/Control/IOVSvc/share/IOVSvcTool_test.ref index e9e3439390078790dc97cbee4be9f1443370c628..7e4028a31327a0f9a8a203b8bec52b3a1c1c82cb 100644 --- a/Control/IOVSvc/share/IOVSvcTool_test.ref +++ b/Control/IOVSvc/share/IOVSvcTool_test.ref @@ -60,9 +60,9 @@ IncidentSvc DEBUG Adding [EndEvent] listener 'ConditionStore' with prior IncidentSvc DEBUG Adding [BeginEvent] listener 'ConditionStore' with priority 100 IncidentSvc DEBUG Adding [BeginEvent] listener 'ToolSvc.IOVSvcTool' with priority 100 IncidentSvc DEBUG Adding [BeginRun] listener 'ToolSvc.IOVSvcTool' with priority 100 -IOVSvcTool INFO IOVRanges will be checked at every Event +ToolSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IncidentSvc DEBUG Adding [CheckIOV] listener 'ToolSvc.IOVSvcTool' with priority 100 IncidentSvc DEBUG Adding [ReloadProxies] listener 'ToolSvc.IOVSvcTool' with priority 100 ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL -IOVSvcTool DEBUG replace proxy [Dooo:6666/old] @0x1ef43f0 with [Dooo:6666/new] @0x1f0c300 +ToolSvc.IOVSvcTool DEBUG replace proxy [Dooo:6666/old] @0x1ef43f0 with [Dooo:6666/new] @0x1f0c300 *** IOVSvcTool_test OK *** diff --git a/Control/IOVSvc/share/IOVSvc_test.ref b/Control/IOVSvc/share/IOVSvc_test.ref index 3ffb86b4f5a95b13bf70010623eb32425b2a67ae..fc0266e0076995501243daf7d6d04abf69fba4e8 100644 --- a/Control/IOVSvc/share/IOVSvc_test.ref +++ b/Control/IOVSvc/share/IOVSvc_test.ref @@ -20,5 +20,5 @@ ApplicationMgr Ready test1 ClassIDSvc INFO getRegistryEntries: read 426 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVSvc ERROR unable to get range from db for 932847540 key diff --git a/Control/IOVSvc/src/IOVSvc.cxx b/Control/IOVSvc/src/IOVSvc.cxx index 24cc4d29f45fc8c4fc08d4987f23cf4c6c8eb132..07fb9ccc3a8e8b54f0ecf9ff41d03227d96d1406 100755 --- a/Control/IOVSvc/src/IOVSvc.cxx +++ b/Control/IOVSvc/src/IOVSvc.cxx @@ -8,7 +8,6 @@ * IOVSvc * * Author: Charles Leggett - * $Id: IOVSvc.cxx,v 1.66 2008-06-04 23:35:03 leggett Exp $ * * Provides automatic updating and callbacks for time dependent data * @@ -568,15 +567,19 @@ StatusCode IOVSvc::createIOVTool( const std::string& storeName, IIOVSvcTool*& ist ) { std::string store(storeName); + std::string toolName("IOVSvcTool"); if (storeName == "default") store = defaultStore; - ATH_MSG_DEBUG( "Creating IOVSvcTool associated with store \"" << store + // Append the store name if not default + if (store != defaultStore) toolName += ("_" + store); + + ATH_MSG_DEBUG( "Creating " << toolName << " associated with store \"" << store << "\"" ); toolMap::iterator itr = m_toolMap.find( store ); if ( itr == m_toolMap.end() ) { ist = nullptr; - if (p_toolSvc->retrieveTool( "IOVSvcTool/" + store, ist, this ).isFailure()) { + if (p_toolSvc->retrieveTool( "IOVSvcTool/" + toolName, ist, this ).isFailure()) { ATH_MSG_ERROR( "Unable to create IOVSvcTool associated with store \"" << store << "\"" ); return StatusCode::FAILURE; diff --git a/Control/IOVSvc/src/IOVSvcTool.cxx b/Control/IOVSvc/src/IOVSvcTool.cxx index b1787cab2d4ca8c3132d52e58f71bedae4a17f31..c7e3b6eae2fa058a8e52e30eec17079d874b1d48 100644 --- a/Control/IOVSvc/src/IOVSvcTool.cxx +++ b/Control/IOVSvc/src/IOVSvcTool.cxx @@ -9,7 +9,6 @@ * IOVSvc * * Author: Charles Leggett - * $Id: IOVSvcTool.cxx,v 1.15 2009-03-25 19:41:46 ivukotic Exp $ * * Tool to provide automatic updating and callbacks for time dependent data * @@ -22,7 +21,6 @@ #include "GaudiKernel/IIncidentListener.h" #include "GaudiKernel/IAlgTool.h" #include "GaudiKernel/IToolSvc.h" -#include "GaudiKernel/MsgStream.h" #include "GaudiKernel/Guards.h" #include "GaudiKernel/ConcurrencyFlags.h" @@ -106,34 +104,13 @@ SortDPptr::operator() (const SG::DataProxy* a, const SG::DataProxy *b) const { IOVSvcTool::IOVSvcTool(const std::string& type, const std::string& name, const IInterface* parent): - AthAlgTool( type, name, parent ), + base_class( type, name, parent ), m_storeName("StoreGateSvc"), - m_log(msgSvc(), "IOVSvcTool"), - p_sgSvc(0), p_cndSvc("DetectorStore",name), p_incSvc("IncidentSvc",name), p_PPSvc("ProxyProviderSvc",name), - p_CLIDSvc("ClassIDSvc",name), p_toolSvc("ToolSvc",name), - m_curTime(0), - p_startSet(nullptr), - p_stopSet(nullptr), - m_first(true), m_checkOnce(false), - m_triggered(false), m_firstEventOfRun(false), m_resetAllCallbacks(false) - + p_CLIDSvc("ClassIDSvc",name), p_toolSvc("ToolSvc",name) { - - // declare my special interface - declareInterface(this); - - - declareProperty("preLoadRanges",m_preLoadRanges=false); - declareProperty("preLoadData",m_preLoadData=false); - declareProperty("partialPreLoadData",m_partialPreLoadData=true); - declareProperty("updateInterval", m_updateInterval="Event"); - declareProperty("sortKeys",m_sortKeys=true); - declareProperty("forceResetAtBeginRun",m_forceReset=false); - m_trigTree = new CBTree(); - } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -179,16 +156,12 @@ IOVSvcTool::initialize() { static const bool CREATEIF(true); - IIOVSvc* p_iovSvc(0); - status = service("IOVSvc", p_iovSvc,CREATEIF); - if (status.isFailure()) { - m_log << MSG::ERROR << "Unable to get the IOVSvc" << endmsg; - return status; - } + IIOVSvc* p_iovSvc(nullptr); + ATH_CHECK( service("IOVSvc", p_iovSvc,CREATEIF) ); + IProperty* iovSvcProp = dynamic_cast( p_iovSvc ); - if (iovSvcProp == 0) { - m_log << MSG::ERROR << "Unable to dcast the IOVSvc to an IProperty" - << endmsg; + if (iovSvcProp == nullptr) { + ATH_MSG_ERROR("Unable to dcast the IOVSvc to an IProperty"); return StatusCode::FAILURE; } @@ -199,14 +172,6 @@ IOVSvcTool::initialize() { setProperty( iovSvcProp->getProperty("sortKeys") ).ignore(); setProperty( iovSvcProp->getProperty("forceResetAtBeginRun") ).ignore(); setProperty( iovSvcProp->getProperty("OutputLevel") ).ignore(); - m_log.setLevel( msg().level() ); - -#ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Initializing IOVSvcTool version " - << PACKAGE_VERSION << endmsg; - } -#endif if (m_storeName == "StoreGateSvc") { status = service("StoreGateSvc", p_sgSvc); @@ -215,9 +180,8 @@ IOVSvcTool::initialize() { status = service(sgn,p_sgSvc); } - if (status.isFailure()) { - m_log << MSG::ERROR << "Unable to get the StoreGateSvc" << endmsg; + ATH_MSG_ERROR("Unable to get the StoreGateSvc"); return status; } @@ -229,65 +193,52 @@ IOVSvcTool::initialize() { m_checkOnce = true; m_checkTrigger = "BeginRun"; p_incSvc->addListener( this, "BeginRun", pri, true); - m_log << MSG::INFO; - m_log.setColor(MSG::GREEN); - m_log << "IOVRanges will be checked only "; - m_log.setColor(MSG::CYAN); - m_log << "once"; - m_log.setColor(MSG::GREEN); - m_log << " at the start of the job" << endmsg; + msg() << MSG::INFO; + msg().setColor(MSG::GREEN); + msg() << "IOVRanges will be checked only "; + msg().setColor(MSG::CYAN); + msg() << "once"; + msg().setColor(MSG::GREEN); + msg() << " at the start of the job" << endmsg; } else if (updi == "RUN") { m_checkTrigger = "BeginRun"; p_incSvc->addListener( this, "BeginRun", pri, true); - m_log << MSG::INFO; - m_log.setColor(MSG::GREEN); - m_log << "IOVRanges will be checked at every "; - m_log.setColor(MSG::CYAN); - m_log << "Run" << endmsg; + msg() << MSG::INFO; + msg().setColor(MSG::GREEN); + msg() << "IOVRanges will be checked at every "; + msg().setColor(MSG::CYAN); + msg() << "Run" << endmsg; } else if (updi == "EVENT") { m_checkTrigger = "BeginEvent"; p_incSvc->addListener( this, "BeginEvent", pri, true); p_incSvc->addListener( this, "BeginRun", pri, true); - m_log << MSG::INFO; - m_log.setColor(MSG::GREEN); - m_log << "IOVRanges will be checked at every "; - m_log.setColor(MSG::CYAN); - m_log << "Event" << endmsg; + msg() << MSG::INFO; + msg().setColor(MSG::GREEN); + msg() << "IOVRanges will be checked at every "; + msg().setColor(MSG::CYAN); + msg() << "Event" << endmsg; } else { - m_log << MSG::FATAL << "jobOption \"updateInterval\" must be one of " - << "\"event\" \"run\" or \"job\"" << endmsg; + ATH_MSG_FATAL("jobOption \"updateInterval\" must be one of " + << "\"event\" \"run\" or \"job\""); return StatusCode::FAILURE; } if (m_preLoadData) { - m_log << MSG::INFO; - m_log.setColor(MSG::GREEN); - m_log << "IOV Data will be preloaded at the same interval" << endmsg; + msg() << MSG::INFO; + msg().setColor(MSG::GREEN); + msg() << "IOV Data will be preloaded at the same interval" << endmsg; } // For hybrid MP/MT p_incSvc->addListener( this, "ReloadProxies", pri, true); - + #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Tool initialized" << endmsg; - } + ATH_MSG_DEBUG("Tool initialized"); #endif return status; } -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -StatusCode -IOVSvcTool::finalize() { - - - // FIXME: do some cleanup - - return StatusCode::SUCCESS; - -} /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -316,14 +267,12 @@ IOVSvcTool::handle(const Incident &inc) { for (auto e : m_ignoredProxyNames) { const DataProxy* proxy = p_cndSvc->proxy(e.first,e.second); - if (proxy == 0) { - m_log << MSG::ERROR << "ignoreProxy: could not retrieve proxy " - << fullProxyName(e.first,e.second) << " from store" << endmsg; + if (proxy == nullptr) { + ATH_MSG_ERROR("ignoreProxy: could not retrieve proxy " + << fullProxyName(e.first,e.second) << " from store"); } else { ignoreProxy( proxy ); - m_log << MSG::DEBUG << "will ignore resetting proxy " - << fullProxyName(proxy) - << endmsg; + ATH_MSG_DEBUG("will ignore resetting proxy " << fullProxyName(proxy)); } } } @@ -354,35 +303,32 @@ IOVSvcTool::handle(const Incident &inc) { event = eventID.lumi_block(); run = eventID.run_number(); - m_log << MSG::DEBUG << "Got event info: " << "run="<< run << ", event=" << event << endmsg; + ATH_MSG_DEBUG("Got event info: " << "run="<< run << ", event=" << event); m_curTime.setRunEvent(run,event); // get ns timestamp from event m_curTime.setTimestamp(1000000000L*(uint64_t)eventID.time_stamp() + eventID.time_stamp_ns_offset()); - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG; - m_log.setColor(MSG::YELLOW,MSG::RED); - m_log << inc.type() << ": [R/LB] = " << m_curTime << endmsg; + if (msgLvl(MSG::DEBUG)) { + msg().setColor(MSG::YELLOW,MSG::RED); + msg() << inc.type() << ": [R/LB] = " << m_curTime << endmsg; } if (inc.type() == IncidentType::BeginRun) { // Signal BeginRun directly to IOVDbSvc IIOVDbSvc *iovDB = 0; if (StatusCode::SUCCESS != service("IOVDbSvc", iovDB, false)) { - m_log << MSG::DEBUG << "Unable to get the IOVDbSvc" << endmsg; + ATH_MSG_DEBUG("Unable to get the IOVDbSvc"); return; } if (StatusCode::SUCCESS != iovDB->signalBeginRun(m_curTime, inc.context())) { - m_log << MSG::ERROR << "Unable to signal begin run to IOVDbSvc" << endmsg; + ATH_MSG_ERROR("Unable to signal begin run to IOVDbSvc"); return; } else { - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Signaled begin run to IOVDbSvc " << m_curTime << endmsg; - } + ATH_MSG_DEBUG("Signaled begin run to IOVDbSvc " << m_curTime); } } @@ -394,37 +340,33 @@ IOVSvcTool::handle(const Incident &inc) { const TransientAddress *tad = *titr; StatusCode sc = regProxy(tad->clID(), tad->name()); if (StatusCode::SUCCESS != sc) { - m_log << MSG::ERROR << "handle: Could not register proxy for " << - fullProxyName(tad->clID(), tad->name()) << endmsg; + ATH_MSG_ERROR("handle: Could not register proxy for " << + fullProxyName(tad->clID(), tad->name())); return; } } - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE; + if (msgLvl(MSG::VERBOSE)) { PrintProxyMap(); - m_log << endmsg; + msg() << endmsg; } - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Callback Tree:" << endmsg; + if (msgLvl(MSG::DEBUG)) { + msg() << "Callback Tree:" << endmsg; m_trigTree->printTree(); } // preLoad the ranges and data if requested. if (preLoadProxies().isFailure()) { - m_log << MSG::ERROR << "Problems preloading IOVRanges" << endmsg; + ATH_MSG_ERROR("Problems preloading IOVRanges"); throw( std::runtime_error("IOVSvcTool::preLoadProxies") ); } // Signal EndProxyPreload directly to IOVDbSvc - IIOVDbSvc *iovDB = 0; - if (StatusCode::SUCCESS == service("IOVDbSvc", iovDB, false)) { + IIOVDbSvc *iovDB = nullptr; + if (service("IOVDbSvc", iovDB, false).isSuccess()) { iovDB->signalEndProxyPreload(); - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Signaled end proxy preload to IOVDbSvc " - << m_curTime << endmsg; - } + ATH_MSG_DEBUG("Signaled end proxy preload to IOVDbSvc " << m_curTime); } } @@ -436,11 +378,10 @@ IOVSvcTool::handle(const Incident &inc) { // Otherwise, do the normal check for validity - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG; + if (msgLvl(MSG::DEBUG)) { PrintStartSet(); PrintStopSet(); - m_log << endmsg; + msg() << endmsg; } std::map > resetKeys; @@ -451,16 +392,16 @@ IOVSvcTool::handle(const Incident &inc) { // if (inc.type() == IncidentType::BeginRun && m_forceReset && !s_firstRun) { - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG - << "Resetting all proxies on BeginRun incident for store \"" - << m_storeName << "\"" << endmsg; - m_log << MSG::VERBOSE; + + ATH_MSG_DEBUG("Resetting all proxies on BeginRun incident for store \"" + << m_storeName << "\""); + + if (msgLvl(MSG::VERBOSE)) { std::set< const SG::DataProxy* >::const_iterator pit; for (pit = m_proxies.begin(); pit != m_proxies.end(); ++pit) { - m_log << " " << m_names[*pit] << std::endl; + msg() << " " << m_names[*pit] << std::endl; } - m_log << endmsg; + msg() << endmsg; } proxiesToReset = m_proxies; m_triggered = false; @@ -483,11 +424,9 @@ IOVSvcTool::handle(const Incident &inc) { if (!m_first && proxiesToReset.size() > 0 && ( (Gaudi::Concurrency::ConcurrencyFlags::numThreads() + Gaudi::Concurrency::ConcurrencyFlags::numConcurrentEvents()) > 0 ) ) { - m_log << MSG::FATAL - << "Cannot update Conditions via callback functions in MT after the first event" - << endmsg; + ATH_MSG_FATAL("Cannot update Conditions via callback functions in MT after the first event"); for (const auto* prox : proxiesToReset) { - m_log << MSG::FATAL << "CLID=" << prox->clID() << ", name=" << prox->name() << endmsg; + ATH_MSG_FATAL("CLID=" << prox->clID() << ", name=" << prox->name()); } throw GaudiException("Cannot update Conditions via callback functions in MT after the first event",name(),StatusCode::FAILURE); } @@ -499,10 +438,7 @@ IOVSvcTool::handle(const Incident &inc) { set< const DataProxy* >::iterator itr; for (itr=proxiesToReset.begin(); itr!=proxiesToReset.end(); ++itr) { DataProxy *prx = const_cast( *itr ); - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "clearing proxy payload for " << m_names[prx] - << endmsg; - } + ATH_MSG_VERBOSE("clearing proxy payload for " << m_names[prx]); // Reset proxy except when one wants to reset callbacks @@ -516,14 +452,11 @@ IOVSvcTool::handle(const Incident &inc) { m_partPreLoad.find(TADkey(*prx)) != m_partPreLoad.end()) || m_preLoadData ) { - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "preloading data" << endmsg; - } + ATH_MSG_VERBOSE("preloading data"); Gaudi::Guards::AuditorGuard auditor(m_names[prx], auditorSvc(), "preLoadProxy"); - if (prx->accessData() == 0) { - m_log << MSG::ERROR << "problems preloading data for " - << m_names[prx] << endmsg; + if (prx->accessData() == nullptr) { + ATH_MSG_ERROR("problems preloading data for " << m_names[prx]); } } @@ -558,9 +491,8 @@ IOVSvcTool::handle(const Incident &inc) { auditorSvc()->before("Callback",m_fcnMap[ff].name()); if ((*ff)(i,resetKeys[ff]).isFailure()) { auditorSvc()->after("Callback",m_fcnMap[ff].name()); - m_log << MSG::ERROR << "Problems calling " << m_fcnMap[ff].name() - << std::endl << "Skipping all subsequent callbacks." - << endmsg; + ATH_MSG_ERROR("Problems calling " << m_fcnMap[ff].name() + << std::endl << "Skipping all subsequent callbacks."); // this will cause a mem leak, but I don't care perr = new IOVCallbackError(m_fcnMap[ff].name()); break; } @@ -568,7 +500,7 @@ IOVSvcTool::handle(const Incident &inc) { } } - if (perr != 0) break; + if (perr != nullptr) break; } } @@ -583,7 +515,7 @@ IOVSvcTool::handle(const Incident &inc) { /// if (m_resetAllCallbacks) { m_resetAllCallbacks = false; - if (perr != 0) throw (*perr); + if (perr != nullptr) throw (*perr); return; } @@ -595,35 +527,29 @@ IOVSvcTool::handle(const Incident &inc) { pitr = m_entries.find( prx ); if ( pitr != m_entries.end() && pitr->second->range()->isInRange(m_curTime) ) { - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "range still valid for " << m_names[prx] - << endmsg; - } - } else { - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "calling provider()->udpateAddress(TAD) for " - << m_names[prx] << endmsg; - } + ATH_MSG_VERBOSE("range still valid for " << m_names[prx]); + } else { + ATH_MSG_DEBUG("calling provider()->udpateAddress(TAD) for " << m_names[prx] ); if (!prx->updateAddress()) { - m_log << MSG::ERROR << "handle: Could not update address" << endmsg; - if (perr != 0) throw (*perr); + ATH_MSG_ERROR("handle: Could not update address"); + if (perr != nullptr) throw (*perr); return; } } - if (m_log.level() <= MSG::VERBOSE) { + if (msgLvl(MSG::VERBOSE)) { IOpaqueAddress *ioa = prx->address(); // Print out some debug info if this is an IOVAddress (coming // from IOVASCIIDbSvc) IOVAddress *iova = dynamic_cast(ioa); - if (iova != 0) { - m_log << MSG::VERBOSE << " range: " << iova->range() << endmsg; + if (iova != nullptr) { + ATH_MSG_VERBOSE(" range: " << iova->range()); } } } - if (perr != 0) throw (*perr); + if (perr != nullptr) throw (*perr); } // end if(inc.type() == m_checkTrigger) @@ -642,36 +568,26 @@ StatusCode IOVSvcTool::regProxy( const DataProxy *proxy, const std::string& key) { - if (proxy == 0) { - m_log << MSG::ERROR << "proxy == 0" << endmsg; + if (proxy == nullptr) { + ATH_MSG_ERROR("proxy == 0"); return StatusCode::FAILURE; } #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "registering proxy " << fullProxyName(proxy) - << " at " << proxy << endmsg; - } + ATH_MSG_DEBUG("registering proxy " << fullProxyName(proxy) << " at " << proxy); #endif if (m_proxies.find(proxy) != m_proxies.end()) { #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Proxy for " << fullProxyName(proxy) - << " already registered: " << proxy->name() - << endmsg; - } + ATH_MSG_DEBUG("Proxy for " << fullProxyName(proxy) + << " already registered: " << proxy->name()); #endif return StatusCode::SUCCESS; } std::string tname, fullname; - StatusCode sc = p_CLIDSvc->getTypeNameOfID(proxy->clID(), tname); - if (sc.isFailure()) { - m_log << MSG::ERROR << "Unable to get type name from ClassIDSvc" << endmsg; - return StatusCode::FAILURE; - } - + ATH_CHECK( p_CLIDSvc->getTypeNameOfID(proxy->clID(), tname) ); + fullname = tname + "[" + key + "]"; m_proxies.insert( proxy ); @@ -693,26 +609,20 @@ StatusCode IOVSvcTool::deregProxy( const DataProxy *proxy) { - if (proxy == 0) { - m_log << MSG::ERROR << "proxy == 0" << endmsg; + if (proxy == nullptr) { + ATH_MSG_ERROR("proxy == 0"); return StatusCode::FAILURE; } #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "removing proxy " << fullProxyName(proxy) - << " at " << proxy << endmsg; - } + ATH_MSG_DEBUG("removing proxy " << fullProxyName(proxy) << " at " << proxy); #endif std::set::iterator itr = m_proxies.find(proxy); if (itr == m_proxies.end()) { #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Proxy for " << fullProxyName(proxy) - << " not registered: " << proxy->name() - << endmsg; - } + ATH_MSG_DEBUG("Proxy for " << fullProxyName(proxy) + << " not registered: " << proxy->name()); #endif return StatusCode::SUCCESS; } @@ -752,29 +662,25 @@ namespace { StatusCode IOVSvcTool::replaceProxy( const SG::DataProxy *pOld, const SG::DataProxy *pNew) { - assert(0 != pOld); - assert(0 != pNew); + assert(nullptr != pOld); + assert(nullptr != pNew); - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "replace proxy " << fullProxyName(pOld) - << " @" << pOld << " with " << fullProxyName(pNew) - << " @" << pNew << endmsg; - } - + ATH_MSG_DEBUG("replace proxy " << fullProxyName(pOld) + << " @" << pOld << " with " << fullProxyName(pNew) + << " @" << pNew); + //start with the proxy list if (0 == m_proxies.erase(pOld)) { - m_log << MSG::DEBUG << "unregProxy: original proxy " - << fullProxyName(pOld) << " not found. Will return now " << endmsg; + ATH_MSG_DEBUG("unregProxy: original proxy " + << fullProxyName(pOld) << " not found. Will return now "); return StatusCode::SUCCESS; } m_proxies.insert(pNew); //new name (possibly identical to old) m_names.erase(pOld); std::string tname; - if ((p_CLIDSvc->getTypeNameOfID(pNew->clID(), tname)).isFailure()) { - m_log << MSG::ERROR << "Unable to get type name from ClassIDSvc" << endmsg; - return StatusCode::FAILURE; - } + ATH_CHECK( p_CLIDSvc->getTypeNameOfID(pNew->clID(), tname) ); + m_names[pNew]=tname + "[" + pNew->name() + "]"; if (pOld != pNew) { @@ -807,9 +713,9 @@ IOVSvcTool::regProxy( const CLID& clid, const std::string& key ) { const DataProxy* proxy = p_cndSvc->proxy(clid,key); - if (proxy == 0) { - m_log << MSG::ERROR << "regProxy could not retrieve proxy " - << fullProxyName(clid,key) << " from store" << endmsg; + if (proxy == nullptr) { + ATH_MSG_ERROR("regProxy could not retrieve proxy " + << fullProxyName(clid,key) << " from store"); return StatusCode::FAILURE; } @@ -827,9 +733,9 @@ IOVSvcTool::deregProxy( const CLID& clid, const std::string& key ) { const DataProxy* proxy = p_cndSvc->proxy(clid,key); - if (proxy == 0) { - m_log << MSG::ERROR << "regProxy could not retrieve proxy " - << fullProxyName(clid,key) << " from store" << endmsg; + if (proxy == nullptr) { + ATH_MSG_ERROR("regProxy could not retrieve proxy " + << fullProxyName(clid,key) << " from store"); return StatusCode::FAILURE; } @@ -847,17 +753,17 @@ IOVSvcTool::preLoadTAD( const TransientAddress *tad_in ) { // check to see if it's a duplicate in preLoad if (m_preLoad.find( tad_in ) != m_preLoad.end()) { - m_log << MSG::WARNING << "preLoadTAD: TransientAddress (" - << tad_in->clID() << "/" << tad_in->name() - << ") alread in preLoad set. Not inserting" << endmsg; + ATH_MSG_WARNING("preLoadTAD: TransientAddress (" + << tad_in->clID() << "/" << tad_in->name() + << ") alread in preLoad set. Not inserting"); return StatusCode::SUCCESS; } // check to see if it's a duplicate in partPreLoad if (m_partPreLoad.find( TADkey(*tad_in) ) != m_partPreLoad.end()) { - m_log << MSG::WARNING << "preLoadTAD: TransientAddress (" - << tad_in->clID() << "/" << tad_in->name() - << ") alread in partPreLoad set. Not inserting" << endmsg; + ATH_MSG_WARNING("preLoadTAD: TransientAddress (" + << tad_in->clID() << "/" << tad_in->name() + << ") alread in partPreLoad set. Not inserting"); return StatusCode::SUCCESS; } @@ -876,16 +782,16 @@ StatusCode IOVSvcTool::preLoadDataTAD( const TransientAddress *tad_in ) { if (m_preLoad.find(tad_in) != m_preLoad.end()) { - m_log << MSG::WARNING << "preLoadDataTAD: TransientAddress " - << fullProxyName( tad_in ) - << " alread in preLoad set. Not inserting" << endmsg; + ATH_MSG_WARNING("preLoadDataTAD: TransientAddress " + << fullProxyName( tad_in ) + << " alread in preLoad set. Not inserting"); return StatusCode::SUCCESS; } if (m_partPreLoad.find(TADkey(*tad_in)) != m_partPreLoad.end()) { - m_log << MSG::WARNING << "preLoadDataTAD: TransientAddress " - << fullProxyName( tad_in ) - << " alread in partPreLoad set. Not inserting" << endmsg; + ATH_MSG_WARNING("preLoadDataTAD: TransientAddress " + << fullProxyName( tad_in ) + << " alread in partPreLoad set. Not inserting"); return StatusCode::SUCCESS; } @@ -919,9 +825,7 @@ void IOVSvcTool::setRange_impl (const SG::DataProxy* proxy, IOVRange& iovr) if (*irn == iovr) { #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Range has not changed. Returning" << endmsg; - } + ATH_MSG_DEBUG("Range has not changed. Returning"); #endif delete range; return; @@ -945,9 +849,7 @@ void IOVSvcTool::setRange_impl (const SG::DataProxy* proxy, IOVRange& iovr) } #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "adding to start and stop sets" << endmsg; - } + ATH_MSG_DEBUG("adding to start and stop sets"); #endif IOVEntry *ent = new IOVEntry(proxy,range); @@ -964,28 +866,24 @@ IOVSvcTool::setRange(const CLID& clid, const std::string& key, { #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "setRange() for clid: " << clid << " key: " << key - << " in IOVrange:" << iovr << endmsg; - } + ATH_MSG_DEBUG("setRange() for clid: " << clid << " key: " << key + << " in IOVrange:" << iovr); #endif if (!iovr.start().isValid() || !iovr.stop().isValid()) { - m_log << MSG::ERROR << "IOVRange " << iovr << "is not valid. Start OK: " - << iovr.start().isValid() << " Stop OK: " << iovr.stop().isValid() - << " run/evt/time min/max " - << IOVTime::MINRUN << "/" << IOVTime::MAXRUN << " " - << IOVTime::MINEVENT << "/" << IOVTime::MAXEVENT << " " - << IOVTime::MINTIMESTAMP << "/" << IOVTime::MAXTIMESTAMP << " " - << endmsg; + ATH_MSG_ERROR("IOVRange " << iovr << "is not valid. Start OK: " + << iovr.start().isValid() << " Stop OK: " << iovr.stop().isValid() + << " run/evt/time min/max " + << IOVTime::MINRUN << "/" << IOVTime::MAXRUN << " " + << IOVTime::MINEVENT << "/" << IOVTime::MAXEVENT << " " + << IOVTime::MINTIMESTAMP << "/" << IOVTime::MAXTIMESTAMP << " "); return StatusCode::FAILURE; } DataProxy* proxy = p_cndSvc->proxy(clid,key); - if (proxy == 0) { - m_log << MSG::ERROR << "setRange: Could not locate proxy for " - << fullProxyName(clid,key) << endmsg; + if (proxy == nullptr) { + ATH_MSG_ERROR("setRange: Could not locate proxy for " << fullProxyName(clid,key)); return StatusCode::FAILURE; } @@ -1021,7 +919,7 @@ IOVSvcTool::getRangeFromDB(const CLID& clid, const std::string& key, if (m_curTime.isValid()) { return getRangeFromDB(clid, key, m_curTime, range, tag, ioa); } else { - m_log << MSG::ERROR << "Current Event not defined" << endmsg; + ATH_MSG_ERROR("Current Event not defined"); return StatusCode::FAILURE; } @@ -1035,17 +933,16 @@ IOVSvcTool::getRangeFromDB(const CLID& clid, const std::string& key, std::string& tag, IOpaqueAddress*& ioa) const { StatusCode sc(StatusCode::FAILURE); DataProxy* dp = p_cndSvc->proxy(clid,key); - if (0 != dp) { + if (nullptr != dp) { IIOVDbSvc *idb = dynamic_cast(dp->provider()); - if (idb != 0) { + if (idb != nullptr) { sc = idb->getRange(clid, key, time, range, tag, ioa); } else { - m_log << MSG::ERROR << "Provider is not an IIOVDbSvc" << endmsg; + ATH_MSG_ERROR("Provider is not an IIOVDbSvc"); } } else { - m_log << MSG::ERROR << "No proxy found for clid " << clid - << " key " << key << endmsg; + ATH_MSG_ERROR("No proxy found for clid " << clid << " key " << key); } return sc; } @@ -1058,31 +955,29 @@ IOVSvcTool::setRangeInDB(const CLID& clid, const std::string& key, if (!range.start().isValid() || !range.stop().isValid()) { - m_log << MSG::ERROR << "IOVRange " << range << "is not valid." << endmsg; + ATH_MSG_ERROR("IOVRange " << range << "is not valid."); return StatusCode::FAILURE; } DataProxy* dp = p_cndSvc->proxy(clid,key); - if (dp == 0) { - m_log << MSG::ERROR << "no Proxy found for " - << fullProxyName( clid, key ) << endmsg; + if (dp == nullptr) { + ATH_MSG_ERROR("no Proxy found for " << fullProxyName( clid, key )); return StatusCode::FAILURE; } std::map::const_iterator itr(m_entries.find(dp)); if (itr == m_entries.end()) { - m_log << MSG::WARNING << fullProxyName(clid,key) - << " not registered with the IOVSvc" << endmsg; + ATH_MSG_WARNING(fullProxyName(clid,key) << " not registered with the IOVSvc"); } IAddressProvider *iadp = dp->provider(); IIOVDbSvc *idb = dynamic_cast(iadp); - if (idb != 0) { + if (idb != nullptr) { return idb->setRange(clid, key, range, tag); } else { - m_log << MSG::ERROR << "Provider is not an IIOVDbSvc" << endmsg; + ATH_MSG_ERROR("Provider is not an IIOVDbSvc"); return StatusCode::FAILURE; } @@ -1093,9 +988,7 @@ IOVSvcTool::setRangeInDB(const CLID& clid, const std::string& key, StatusCode IOVSvcTool::preLoadProxies() { - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "preLoadProxies()" << endmsg; - } + ATH_MSG_DEBUG("preLoadProxies()"); StatusCode scr(StatusCode::SUCCESS); @@ -1106,19 +999,18 @@ IOVSvcTool::preLoadProxies() { DataProxy *dp = const_cast (*itr); Gaudi::Guards::AuditorGuard auditor(m_names[dp], auditorSvc(), "preLoadProxy"); - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE; - m_log.setColor(MSG::CYAN); - m_log << "loading proxy for CLID: " << dp->clID() + if (msgLvl(MSG::VERBOSE)) { + msg().setColor(MSG::CYAN); + msg() << "loading proxy for CLID: " << dp->clID() << " " << m_names[dp] << endmsg; } - if (dp->provider() == 0) { - m_log << MSG::FATAL << "No provider found for proxy " << m_names[dp] + if (dp->provider() == nullptr) { + msg() << MSG::FATAL << "No provider found for proxy " << m_names[dp] << ". It is probably not a conditions object" << endl; - m_log << "Proxy Map: "; + msg() << "Proxy Map: "; PrintProxyMap(dp); - m_log << endmsg; + msg() << endmsg; scr = StatusCode::FAILURE; return (scr); } @@ -1129,9 +1021,7 @@ IOVSvcTool::preLoadProxies() { // This gets us to an IAddressProvider (eg IOVDbSvc) pair pi = m_proxyMap.equal_range(dp); if (pi.first != pi.second || m_preLoadRanges) { - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "updating Range" << endmsg; - } + ATH_MSG_VERBOSE("updating Range"); if (!dp->updateAddress()) sc = StatusCode::FAILURE; } @@ -1140,12 +1030,12 @@ IOVSvcTool::preLoadProxies() { m_partPreLoad.find(TADkey(*dp)) != m_partPreLoad.end() ) || m_preLoadData ) { - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "preloading data for (" - << dp->clID() << "/" - << dp->name() << ")" << endmsg; - } - sc = ( dp->accessData() != 0 ? + + ATH_MSG_VERBOSE("preloading data for (" + << dp->clID() << "/" + << dp->name() << ")"); + + sc = ( dp->accessData() != nullptr ? StatusCode::SUCCESS : StatusCode::FAILURE ); } @@ -1164,15 +1054,14 @@ IOVSvcTool::preLoadProxies() { } CBNode* cn = m_trigTree->findNode( *itr ); - if (cn != 0) { + if (cn != nullptr) { m_trigTree->cascadeTrigger(1, cn); } } if (scr.isFailure()) { - m_log << MSG::ERROR << "Problems preLoading proxies. No callbacks triggered." - << endmsg; + ATH_MSG_ERROR("Problems preLoading proxies. No callbacks triggered."); return scr; } @@ -1189,8 +1078,7 @@ IOVSvcTool::preLoadProxies() { auditorSvc()->before("Callback",m_fcnMap[ff].name()); if ((*ff)(i,resetKeys[ff]).isFailure()) { auditorSvc()->after("Callback",m_fcnMap[ff].name()); - m_log << MSG::ERROR << "Problems calling " << m_fcnMap[ff].name() - << endmsg; + ATH_MSG_ERROR("Problems calling "); return StatusCode::FAILURE; } auditorSvc()->after("Callback",m_fcnMap[ff].name()); @@ -1210,16 +1098,14 @@ StatusCode IOVSvcTool::triggerCallback(IOVSvcCallBackFcn* fcn, const std::string& key ) { #ifndef NDEBUG - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "triggerCallback(BFCN*)"<< endmsg; - } + ATH_MSG_VERBOSE("triggerCallback(BFCN*)"); #endif int I; std::list klist; klist.push_back(key); if ( (*fcn)(I,klist).isFailure() ) { - m_log << MSG::ERROR << "calling " << m_fcnMap[fcn].name() << endmsg; + ATH_MSG_ERROR("calling "); return StatusCode::FAILURE; } @@ -1233,16 +1119,13 @@ IOVSvcTool::triggerCallback( const SG::DataProxy *dp, const std::string& key ) { #ifndef NDEBUG - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "triggerCallback(DataProxy*)"<< endmsg; - } + ATH_MSG_VERBOSE("triggerCallback(DataProxy*)"); #endif - std::map::const_iterator pitr = + std::map::const_iterator pitr = m_proxyMap.find(dp); if (pitr == m_proxyMap.end()) { - m_log << MSG::ERROR << "no callback associated with DataProxy " - << m_names[dp] << endmsg; + ATH_MSG_ERROR("no callback associated with DataProxy " << m_names[dp]); return StatusCode::FAILURE; } @@ -1260,20 +1143,20 @@ IOVSvcTool::PrintStartSet() { std::string objname; if (m_startSet_Clock.begin() != m_startSet_Clock.end()) { - m_log << endl << "ClockTime start set: " << endl; + msg() << endl << "ClockTime start set: " << endl; for (start_itr = m_startSet_Clock.begin(); start_itr!=m_startSet_Clock.end(); ++start_itr ) { objname = m_names[ (*start_itr)->proxy() ]; - m_log << " " << objname << " (" << (*start_itr)->proxy() << ") " + msg() << " " << objname << " (" << (*start_itr)->proxy() << ") " << (*start_itr)->range()->start() << endl; } - m_log << endl; + msg() << endl; } if (m_startSet_RE.begin() != m_startSet_RE.end()) { - m_log << "Run/Event start set: " << endl; + msg() << "Run/Event start set: " << endl; for (start_itr = m_startSet_RE.begin(); start_itr!=m_startSet_RE.end();++start_itr ) { objname = m_names[ (*start_itr)->proxy() ]; - m_log << " " << objname << " (" << (*start_itr)->proxy() << ") " + msg() << " " << objname << " (" << (*start_itr)->proxy() << ") " << (*start_itr)->range()->start() << endl; } } @@ -1288,20 +1171,20 @@ IOVSvcTool::PrintStopSet() { std::string objname; if (m_stopSet_Clock.begin() != m_stopSet_Clock.end()) { - m_log << endl << "ClockTime stop set: " << endl; + msg() << endl << "ClockTime stop set: " << endl; for( stop_itr=m_stopSet_Clock.begin(); stop_itr!=m_stopSet_Clock.end(); ++stop_itr ) { objname = m_names[ (*stop_itr)->proxy() ]; - m_log << " " << objname << " (" << (*stop_itr)->proxy() << ") " + msg() << " " << objname << " (" << (*stop_itr)->proxy() << ") " << (*stop_itr)->range()->stop() << endl; } - m_log << endl; + msg() << endl; } if (m_stopSet_RE.begin() != m_stopSet_RE.end()) { - m_log << "Run/Event stop set: " << endl; + msg() << "Run/Event stop set: " << endl; for( stop_itr=m_stopSet_RE.begin(); stop_itr!=m_stopSet_RE.end(); ++stop_itr ) { objname = m_names[ (*stop_itr)->proxy() ]; - m_log << " " << objname << " (" << (*stop_itr)->proxy() << ") " + msg() << " " << objname << " (" << (*stop_itr)->proxy() << ") " << (*stop_itr)->range()->stop() << endl; } } @@ -1311,8 +1194,8 @@ IOVSvcTool::PrintStopSet() { void IOVSvcTool::PrintProxyMap(){ - m_log << endl; - m_log << "------------------------------ IOVSvc Proxy Map " + msg() << endl; + msg() << "------------------------------ IOVSvc Proxy Map " << "------------------------------" << endl; std::set::const_iterator itr; @@ -1321,7 +1204,7 @@ IOVSvcTool::PrintProxyMap(){ PrintProxyMap(*itr); } - m_log << "----------------------------------------------------------" + msg() << "----------------------------------------------------------" << "---------------------" << endl; } @@ -1330,20 +1213,20 @@ IOVSvcTool::PrintProxyMap(){ void IOVSvcTool::PrintProxyMap(const SG::DataProxy* dp){ - m_log << " " << dp << " " << dp->clID() << " " + msg() << " " << dp << " " << dp->clID() << " " << m_names.find(dp)->second << endl; pair pi = m_proxyMap.equal_range(dp); pmITR pitr; if (pi.first == pi.second) { - m_log << " -> no callback associated" << endl; + msg() << " -> no callback associated" << endl; } else { for (pitr=pi.first; pitr!=pi.second; ++pitr) { BFCN* fcn = pitr->second; map::const_iterator fitr = m_fcnMap.find(fcn); CallBackID cbid = fitr->second; - m_log << " -> " << fcn << " " << cbid.name() << endl; + msg() << " -> " << fcn << " " << cbid.name() << endl; } } } @@ -1360,17 +1243,16 @@ IOVSvcTool::regFcn(SG::DataProxy* dp, std::string tname,fullname; StatusCode sc = p_CLIDSvc->getTypeNameOfID( dp->clID(), tname ); if (sc.isFailure()) { - m_log << MSG::ERROR << "Unable to get type name from ClassIDSvc" << endmsg; + ATH_MSG_ERROR("Unable to get type name from ClassIDSvc"); return StatusCode::FAILURE; } fullname = tname + "[" + dp->name() + "]"; // see if proxy already bound if (m_proxies.find( dp ) == m_proxies.end()) { - m_log << MSG::ERROR << "Cannot register object " << c.name() - << " with DataHandle " << fullname - << " -> Need to bind DataHandle first" - << endmsg; + ATH_MSG_ERROR("Cannot register object " << c.name() + << " with DataHandle " << fullname + << " -> Need to bind DataHandle first"); return StatusCode::FAILURE; } else { m_names[dp] = fullname; @@ -1381,8 +1263,8 @@ IOVSvcTool::regFcn(SG::DataProxy* dp, std::pair fitr = m_proxyMap.equal_range( dp ); for (pmITR p=fitr.first; p!=fitr.second; ++p) { if ( m_fcnMap[p->second] == c ) { - m_log << MSG::ERROR << "CallBack function " << c.name() - << " already registered against " << fullname << endmsg; + ATH_MSG_ERROR("CallBack function " << c.name() + << " already registered against " << fullname); return StatusCode::FAILURE; } } @@ -1414,31 +1296,25 @@ IOVSvcTool::regFcn(SG::DataProxy* dp, // add it to the trigger tree. CBNode *cn = m_trigTree->findNode(obs); - if ( cn == 0) { + if ( cn == nullptr) { m_trigTree->addNode(obs,c,dp); } else { CBNode *cp = m_trigTree->findNode(dp); if (cp) m_trigTree->connectNode(cn,cp); else - m_log << MSG::ERROR << "Cannot find callback node for parent DataProxy " - << dp->name() - << endmsg; + ATH_MSG_ERROR("Cannot find callback node for parent DataProxy " + << dp->name()); } #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "register by " << c.name() << " bound to " << fullname - << endmsg; - } + ATH_MSG_DEBUG("register by " << c.name() << " bound to " << fullname); #endif if (trigger) { if (m_first) { - m_log << MSG::INFO - << "Still in initialize phase, not tiggering callback for " - << c.name() << " bound to " << fullname - << endmsg; + ATH_MSG_INFO("Still in initialize phase, not tiggering callback for " + << c.name() << " bound to " << fullname); } else { return triggerCallback(obs, dp->name()); } @@ -1471,11 +1347,9 @@ IOVSvcTool::regFcn(const CallBackID c1, if (prx1 == prx2) { #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Callback function " << c2.name() - << " cannot be registered since it has already been registered " - << "against " << m_names[prx1] << endmsg; - } + ATH_MSG_DEBUG("Callback function " << c2.name() + << " cannot be registered since it has already been registered " + << "against " << m_names[prx1]); #endif } else { proxyset.insert(prx1); // don't care if it gets done many times @@ -1497,11 +1371,9 @@ IOVSvcTool::regFcn(const CallBackID c1, if (proxyset.size() == 0) { #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "Callback function " << c2.name() - << " cannot be registered, since it has already been registered" - << " against everything it can be." << endmsg; - } + ATH_MSG_DEBUG("Callback function " << c2.name() + << " cannot be registered, since it has already been registered" + << " against everything it can be."); #endif return StatusCode::SUCCESS; } @@ -1525,10 +1397,7 @@ IOVSvcTool::regFcn(const CallBackID c1, m_bfcnMap.insert(std::pair(obs2,prx)); #ifndef NDEBUG - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "register by " << c2.name() << " bound to " - << m_names[prx] << endmsg; - } + ATH_MSG_DEBUG("register by " << c2.name() << " bound to " << m_names[prx]); #endif klist.push_back( prx->name() ); @@ -1537,13 +1406,13 @@ IOVSvcTool::regFcn(const CallBackID c1, // note that the ordering of the parameters in addNode is the reverse // order of regFcn CBNode *cn = m_trigTree->findNode(obs2); - if ( cn == 0) { + if ( cn == nullptr) { m_trigTree->addNode(obs2,c2,obs1); } else { CBNode *cp = m_trigTree->findNode(obs1); - if (cp == 0) { - m_log << MSG::ERROR << "regFcn: could not locate parent of " << cn->name() - << ". This should never happen" << endmsg; + if (cp == nullptr) { + ATH_MSG_ERROR("regFcn: could not locate parent of " << cn->name() + << ". This should never happen"); return StatusCode::FAILURE; } m_trigTree->connectNode(cn,cp); @@ -1552,10 +1421,8 @@ IOVSvcTool::regFcn(const CallBackID c1, if (trigger) { if (m_first) { - m_log << MSG::INFO - << "Still in initialize phase, not tiggering callback for " - << c2.name() << " bound to " << *klist.begin() - << endmsg; + ATH_MSG_INFO("Still in initialize phase, not tiggering callback for " + << c2.name() << " bound to " << *klist.begin()); } else { return triggerCallback(obs2, *(klist.begin()) ); } @@ -1576,8 +1443,7 @@ IOVSvcTool::regFcn(const IAlgTool* ia, if (oitr == m_objMap.end()) { // tool not registered at all - m_log << MSG::ERROR << "No callback registered with AlgTool " << ia->name() - << endmsg; + ATH_MSG_ERROR("No callback registered with AlgTool " << ia->name()); return StatusCode::FAILURE; } else { @@ -1591,10 +1457,8 @@ IOVSvcTool::regFcn(const IAlgTool* ia, } else { // there is more than one callback registered to this tool - - m_log << MSG::ERROR << "More than one callback registered to AlgTool " - << ia->name() << ". Found : " << sc->size() - << endmsg; + ATH_MSG_ERROR("More than one callback registered to AlgTool " + << ia->name() << ". Found : " << sc->size()); return StatusCode::FAILURE; } } @@ -1638,16 +1502,16 @@ IOVSvcTool::scanStartSet(startSet &pSet, const std::string &type, if (pSet.begin()==pSet.end()) return; - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "--> scan for resets: start set: " << type << endl; + if (msgLvl(MSG::DEBUG)) { + msg() << MSG::DEBUG << "--> scan for resets: start set: " << type << endl; } startITR start_itr( pSet.begin() ); while ( start_itr != pSet.end() ) { if (m_resetAllCallbacks || (*start_itr)->range()->start() > m_curTime) { - if (m_log.level() <= MSG::DEBUG) { - m_log << "\t" << m_names[ (*start_itr)->proxy() ] << ": " + if (msgLvl(MSG::DEBUG)) { + msg() << "\t" << m_names[ (*start_itr)->proxy() ] << ": " << (*start_itr)->range()->start()<<" <- removed"<proxy() ); @@ -1660,8 +1524,8 @@ IOVSvcTool::scanStartSet(startSet &pSet, const std::string &type, } } - if (m_log.level() <= MSG::DEBUG) { - m_log << endmsg; + if (msgLvl(MSG::DEBUG)) { + msg() << endmsg; } } @@ -1675,16 +1539,16 @@ IOVSvcTool::scanStopSet(stopSet &pSet, const std::string &type, std::string objname; if (pSet.begin()==pSet.end()) return; - if (m_log.level() <= MSG::DEBUG) { - m_log << MSG::DEBUG << "--> scan for resets: stop set: " << type << endl; + if (msgLvl(MSG::DEBUG)) { + msg() << MSG::DEBUG << "--> scan for resets: stop set: " << type << endl; } stopITR stop_itr(pSet.begin()); while ( stop_itr != pSet.end() ) { if (m_resetAllCallbacks || (*stop_itr)->range()->stop() <= m_curTime) { - if (m_log.level() <= MSG::DEBUG) { - m_log << " " << m_names[ (*stop_itr)->proxy() ] << ": " + if (msgLvl(MSG::DEBUG)) { + msg() << " " << m_names[ (*stop_itr)->proxy() ] << ": " << (*stop_itr)->range()->stop()<< " -> removed"<proxy() ); @@ -1696,8 +1560,8 @@ IOVSvcTool::scanStopSet(stopSet &pSet, const std::string &type, break; } } - if (m_log.level() <= MSG::DEBUG) { - m_log << endmsg; + if (msgLvl(MSG::DEBUG)) { + msg() << endmsg; } } @@ -1718,9 +1582,9 @@ IOVSvcTool::holdsProxy( const CLID& clid, const std::string& key ) const { const DataProxy* proxy = p_cndSvc->proxy(clid,key); - if (proxy == 0) { - m_log << MSG::ERROR << "holdsProxy: could not retrieve proxy " - << fullProxyName(clid,key) << " from store" << endmsg; + if (proxy == nullptr) { + ATH_MSG_ERROR("holdsProxy: could not retrieve proxy " + << fullProxyName(clid,key) << " from store"); return false; } @@ -1757,10 +1621,7 @@ IOVSvcTool::resetAllProxies() { for (; itr != m_proxies.end(); ++itr) { DataProxy *prx = const_cast( *itr ); #ifndef NDEBUG - if (m_log.level() <= MSG::VERBOSE) { - m_log << MSG::VERBOSE << "clearing proxy payload for " << m_names[prx] - << endmsg; - } + ATH_MSG_VERBOSE("clearing proxy payload for " << m_names[prx]); #endif p_cndSvc->clearProxyPayload(prx); diff --git a/Control/IOVSvc/src/IOVSvcTool.h b/Control/IOVSvc/src/IOVSvcTool.h index 937582a0fd0025f2d540f03459afa53183c97d0c..e14bb721cc52424e5bb731111d684e5c6a1a1cfc 100644 --- a/Control/IOVSvc/src/IOVSvcTool.h +++ b/Control/IOVSvc/src/IOVSvcTool.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #ifndef IOVSVC_IOVSVCTOOL_H @@ -12,7 +12,6 @@ * IOVSvc * * Author: Charles Leggett - * $Id: IOVSvcTool.h,v 1.7 2008-06-04 23:35:03 leggett Exp $ * * Provides automatic updating and callbacks for time dependent data * This AlgTool does the real work. @@ -24,7 +23,6 @@ #include "GaudiKernel/StatusCode.h" #include "GaudiKernel/ClassID.h" #include "GaudiKernel/IIncidentListener.h" -#include "GaudiKernel/MsgStream.h" #include "GaudiKernel/ServiceHandle.h" #include "AthenaKernel/IOVTime.h" @@ -69,9 +67,7 @@ public: }; -class IOVSvcTool: virtual public IIOVSvcTool, - virtual public IIncidentListener, - virtual public AthAlgTool { +class IOVSvcTool: public extends { public: @@ -79,15 +75,14 @@ public: const IInterface* parent); - virtual StatusCode initialize(); - virtual StatusCode reinitialize(); - virtual StatusCode finalize(); + virtual StatusCode initialize() override; + virtual StatusCode reinitialize() override; ///////////////////////////////////////////////////////////////////////// // Incident handler - void handle(const Incident&); + virtual void handle(const Incident&) override; void setStoreName(const std::string& storeName) { m_storeName = storeName; @@ -95,70 +90,70 @@ public: const std::string& getStoreName() const { return m_storeName; } // register callback functions - StatusCode regFcn(SG::DataProxy *dp, const CallBackID c, - const IOVSvcCallBackFcn& fcn, bool trigger = false); + virtual StatusCode regFcn(SG::DataProxy *dp, const CallBackID c, + const IOVSvcCallBackFcn& fcn, bool trigger = false) override; - StatusCode regFcn(const CallBackID c1, - const CallBackID c2, const IOVSvcCallBackFcn& fcn2, - bool trigger = false); + virtual StatusCode regFcn(const CallBackID c1, + const CallBackID c2, const IOVSvcCallBackFcn& fcn2, + bool trigger = false) override; - StatusCode regFcn(const IAlgTool* ia, - const CallBackID c2, const IOVSvcCallBackFcn& fcn2, - bool trigger = false); + virtual StatusCode regFcn(const IAlgTool* ia, + const CallBackID c2, const IOVSvcCallBackFcn& fcn2, + bool trigger = false) override; // Update Range from dB virtual StatusCode setRange(const CLID& clid, const std::string& key, - IOVRange&); + IOVRange&) override; virtual StatusCode getRange(const CLID& clid, const std::string& key, - IOVRange& iov) const; + IOVRange& iov) const override; // Subscribe method for DataProxy. key StoreGate key virtual StatusCode regProxy( const SG::DataProxy *proxy, - const std::string& key ); + const std::string& key ) override; // Another way to subscribe - virtual StatusCode regProxy( const CLID& clid, const std::string& key ); + virtual StatusCode regProxy( const CLID& clid, const std::string& key ) override; - virtual StatusCode deregProxy( const SG::DataProxy *proxy ); - virtual StatusCode deregProxy( const CLID& clid, const std::string& key ); + virtual StatusCode deregProxy( const SG::DataProxy *proxy ) override; + virtual StatusCode deregProxy( const CLID& clid, const std::string& key ) override; // replace method for DataProxy, to be used when an update is necessary virtual StatusCode replaceProxy( const SG::DataProxy *pOld, - const SG::DataProxy *pNew); + const SG::DataProxy *pNew) override; // Get IOVRange from db for current event virtual StatusCode getRangeFromDB(const CLID& clid, const std::string& key, IOVRange& range, std::string &tag, - IOpaqueAddress*& ioa) const; + IOpaqueAddress*& ioa) const override; // Get IOVRange from db for a particular event virtual StatusCode getRangeFromDB(const CLID& clid, const std::string& key, const IOVTime& time, IOVRange& range, std::string &tag, - IOpaqueAddress*& ioa) const; + IOpaqueAddress*& ioa) const override; // Set a particular IOVRange in db (and memory) virtual StatusCode setRangeInDB(const CLID& clid, const std::string& key, const IOVRange& range, - const std::string &tag); + const std::string &tag) override; // supply a list of TADs whose proxies will be preloaded - virtual StatusCode preLoadTAD( const SG::TransientAddress * ); + virtual StatusCode preLoadTAD( const SG::TransientAddress * ) override; // supply a list of TADs whose data will be preloaded - virtual StatusCode preLoadDataTAD( const SG::TransientAddress * ); + virtual StatusCode preLoadDataTAD( const SG::TransientAddress * ) override; // return list of tools (or functions) that have been triggered by key // will return FAILURE if no tools found, or no key found virtual StatusCode getTriggeredTools(const std::string& key, - std::set& tools); + std::set& tools) override; bool holdsProxy( const SG::DataProxy* proxy ) const; bool holdsProxy( const CLID& clid, const std::string& key ) const; bool holdsCallback( const CallBackID& ) const; bool holdsAlgTool( const IAlgTool* ia ) const; - virtual void resetAllProxies(); + virtual void resetAllProxies() override; void ignoreProxy( const CLID& clid, const std::string& key ) { m_ignoredProxyNames.insert( std::make_pair(clid,key) ); @@ -183,17 +178,14 @@ private: std::string m_storeName; - mutable MsgStream m_log; - - StoreGateSvc* p_sgSvc; + StoreGateSvc* p_sgSvc{nullptr}; ServiceHandle p_cndSvc; - // ServiceHandle p_cndSvc; ServiceHandle p_incSvc; ServiceHandle p_PPSvc; ServiceHandle p_CLIDSvc; ServiceHandle p_toolSvc; - IOVTime m_curTime; + IOVTime m_curTime{0}; typedef IOVSvcCallBackFcn BFCN; typedef std::multimap::iterator pmITR; @@ -220,14 +212,13 @@ private: std::map< const SG::DataProxy*, IOVEntry*> m_entries; - startSet *p_startSet; - stopSet *p_stopSet; + startSet *p_startSet{nullptr}; + stopSet *p_stopSet{nullptr}; startSet m_startSet_Clock, m_startSet_RE; stopSet m_stopSet_Clock, m_stopSet_RE; - - CBTree* m_trigTree; + CBTree* m_trigTree{nullptr}; std::set< const SG::TransientAddress*, SortTADptr > m_preLoad; @@ -238,16 +229,21 @@ private: { return TADkey_t (t.clID(), t.name()); } std::set< TADkey_t > m_partPreLoad; - bool m_first; - BooleanProperty m_preLoadRanges, m_preLoadData, m_partialPreLoadData; - BooleanProperty m_sortKeys, m_forceReset; - StringProperty m_updateInterval; - bool m_checkOnce; - bool m_triggered; - bool m_firstEventOfRun; - bool m_resetAllCallbacks; + bool m_first{true}; + bool m_checkOnce{false}; + bool m_triggered{false}; + bool m_firstEventOfRun{false}; + bool m_resetAllCallbacks{false}; std::string m_checkTrigger; + Gaudi::Property m_preLoadRanges{this, "preLoadRanges", false}; + Gaudi::Property m_preLoadData{this, "preLoadData", false}; + Gaudi::Property m_partialPreLoadData{this, "partialPreLoadData", true}; + Gaudi::Property m_sortKeys{this, "sortKeys", true}; + Gaudi::Property m_forceReset{this, "forceResetAtBeginRun", false}; + Gaudi::Property m_updateInterval{this, "updateInterval", "Event"}; + + void scanStartSet(startSet &pSet, const std::string &type, std::set &proxiesToReset); void scanStopSet(stopSet &pSet, const std::string &type, @@ -257,11 +253,7 @@ private: void PrintStopSet(); void PrintProxyMap(); void PrintProxyMap(const SG::DataProxy*); - -private: - IOVSvcTool (const IOVSvcTool&); - IOVSvcTool& operator= (const IOVSvcTool&); }; #endif diff --git a/Control/IOVSvc/test/IOVSvcTool_test.cxx b/Control/IOVSvc/test/IOVSvcTool_test.cxx index 14b46ca0021a07ecc4ca40fd92ae8998baf74a96..819e719a4fb362e8994c26a5e8d119a4df4e33fe 100644 --- a/Control/IOVSvc/test/IOVSvcTool_test.cxx +++ b/Control/IOVSvc/test/IOVSvcTool_test.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ #undef NDEBUG @@ -56,9 +56,9 @@ int main() { //initGaudi(pSvc); IToolSvc* pTS(0); assert((pSvc->service("ToolSvc", pTS, true)).isSuccess()); - IAlgTool* pTool(0); - assert((pTS->retrieve("IOVSvcTool", IIOVSvcTool::interfaceID(), pTool, 0, true)).isSuccess()); - IOVSvcTool_test(dynamic_cast(pTool)); + IIOVSvcTool* pTool(0); + assert((pTS->retrieveTool("IOVSvcTool", pTool, 0, true)).isSuccess()); + IOVSvcTool_test(pTool); std::cout << "*** IOVSvcTool_test OK ***" << std::endl; return 0; } diff --git a/Database/IOVDbSvc/share/IOVDbSvc_test.ref b/Database/IOVDbSvc/share/IOVDbSvc_test.ref index 01fe30e1b089e75fa2be3dcdcfaba375ff8d3c12..177dc6aa85151597c0945bea98012866ba87cb72 100644 --- a/Database/IOVDbSvc/share/IOVDbSvc_test.ref +++ b/Database/IOVDbSvc/share/IOVDbSvc_test.ref @@ -37,7 +37,7 @@ IOVDbSvc INFO Initialised with 2 connections and 2 folders IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO Opening COOL connection for sqlite://none;schema=mytest.db;dbname=OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Disconnecting from sqlite://none;schema=mytest.db;dbname=OFLP200 test1 IOVDbSvc INFO Opening COOL connection for sqlite://none;schema=mytest.db;dbname=OFLP200 diff --git a/LArCalorimeter/LArCellRec/share/LArBadFebMaskingTool_test.ref b/LArCalorimeter/LArCellRec/share/LArBadFebMaskingTool_test.ref index edabc99b20901d6826a161d669455d4dd55383be..75485a1b4654c0a3870aa3c9bcb7169a6e01ac65 100644 --- a/LArCalorimeter/LArCellRec/share/LArBadFebMaskingTool_test.ref +++ b/LArCalorimeter/LArCellRec/share/LArBadFebMaskingTool_test.ref @@ -69,7 +69,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event ClassIDSvc INFO getRegistryEntries: read 2071 CLIDRegistry entries for module ALL IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 @@ -310,7 +310,7 @@ ClassIDSvc INFO getRegistryEntries: read 65 CLIDRegistry entries for ClassIDSvc INFO getRegistryEntries: read 4020 CLIDRegistry entries for module ALL ToolSvc.tool1 INFO bit mask for errors to mask 16381 ClassIDSvc INFO getRegistryEntries: read 64 CLIDRegistry entries for module ALL -IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingService[0x9c1be00]+7f17d048f650 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingService[0x9c1be00]+7f17d048f650 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap] ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/OnOffIdMap ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/CalibIdMap ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/FebRodMap diff --git a/LArCalorimeter/LArCellRec/share/LArCellBuilderFromLArHitTool_test.ref b/LArCalorimeter/LArCellRec/share/LArCellBuilderFromLArHitTool_test.ref index aa5dee66b36fbfbc7a008f0143e65e872588ce4e..c7fafbc4fbad9c0dfa27dbab04bf48751bfb4fce 100644 --- a/LArCalorimeter/LArCellRec/share/LArCellBuilderFromLArHitTool_test.ref +++ b/LArCalorimeter/LArCellRec/share/LArCellBuilderFromLArHitTool_test.ref @@ -83,7 +83,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event ClassIDSvc INFO getRegistryEntries: read 2159 CLIDRegistry entries for module ALL IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 @@ -304,7 +304,7 @@ LArOnlineIDDetD... INFO in createObj: creating a LArOnlineID helper object in LArOnlineID INFO initialize_from_dictionary AtlasDetectorID INFO initialize_from_dictionary - OK ClassIDSvc INFO getRegistryEntries: read 2292 CLIDRegistry entries for module ALL -IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingLegacyService[0x3cb93400]+7f4b9daee660 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingLegacyService[0x3cb93400]+7f4b9daee660 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap] ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/OnOffIdMap ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/CalibIdMap ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/FebRodMap @@ -314,7 +314,7 @@ ToolSvc.LArADC2... INFO Registered callback for key: LArDAC2uA ToolSvc.LArADC2... INFO Registered callback for key: LAruA2MeV ToolSvc.LArADC2... INFO Registered callback for key: LArMphysOverMcal ToolSvc.LArADC2... INFO Registered callback for key: LArHVScaleCorr -IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArMCSymTool[0x3cb92a00]+189 bound to /LAR/Identifier/CalibIdMap +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArMCSymTool[0x3cb92a00]+189 bound to /LAR/Identifier/CalibIdMap ClassIDSvc INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL ToolSvc.LArAuto... INFO Registered callback for key: LArShape ToolSvc.LArAuto... INFO Registered callback for key: LArAutoCorr @@ -322,19 +322,19 @@ ToolSvc.LArOFCT... INFO Registered callback for key: LArShape ToolSvc.LArOFCT... INFO Registered callback for key: LArNoise ToolSvc.LArOFCT... INFO Registered callback for LArOFCTool/LArAutoCorrTotalTool ToolSvc.CaloNoi... INFO Will cache electronic noise -IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArNoiseMC[LArNoise] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArNoiseMC[LArNoise] ToolSvc.CaloNoi... INFO Registered callback for key: LArNoise -IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArAutoCorrMC[LArAutoCorr] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArAutoCorrMC[LArAutoCorr] ToolSvc.CaloNoi... INFO Registered callback for key: LArAutoCorr -IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArShape32MC[LArShape] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArShape32MC[LArShape] ToolSvc.CaloNoi... INFO Registered callback for key: LArShape -IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArfSamplMC[LArfSampl] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArfSamplMC[LArfSampl] ToolSvc.CaloNoi... INFO Registered callback for key: LArfSampl -IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArMinBiasMC[LArMinBias] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArMinBiasMC[LArMinBias] ToolSvc.CaloNoi... INFO Registered callback for key: LArMinBias -IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArDAC2uA +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArDAC2uA ToolSvc.CaloNoi... INFO Registered callbacks for LArADC2MeVTool -> CaloNoiseTool -IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArAutoCorr +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for CaloNoiseTool[0x3d05c388]+191 bound to LArAutoCorr ToolSvc.CaloNoi... INFO Registered callbacks for LArOFCTool -> CaloNoiseTool ToolSvc.CaloNoi... INFO CaloNoiseTool initialize() end ToolSvc.tool1em INFO no noise selected diff --git a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref index 349eca0e638190f1cbc1dec2f41bf1d36acb2826..14d2c35cacab673fc9801379ad0323ad7ee5b274 100644 --- a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref +++ b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref @@ -69,7 +69,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event ClassIDSvc INFO getRegistryEntries: read 2071 CLIDRegistry entries for module ALL IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 @@ -304,12 +304,12 @@ ClassIDSvc INFO getRegistryEntries: read 186 CLIDRegistry entries for ClassIDSvc INFO getRegistryEntries: read 4041 CLIDRegistry entries for module ALL ToolSvc.tool1 INFO Initializing LArCellDeadOTXCorr ClassIDSvc INFO getRegistryEntries: read 99 CLIDRegistry entries for module ALL -IOVSvcTool INFO Still in initialize phase, not tiggering callback for Blob2ToolConstants[0x3d2ac900]+7fb4da898e70 bound to CondAttrListCollection[/LAR/CellCorrOfl/deadOTX] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for Blob2ToolConstants[0x3d2ac900]+7fb4da898e70 bound to CondAttrListCollection[/LAR/CellCorrOfl/deadOTX] ToolSvc.Blob2To... INFO Successfully registered callback for CondAttributeListCollection object with key /LAR/CellCorrOfl/deadOTX -IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCellDeadOTXCorr[0x3cbec820]+89 bound to /LAR/CellCorrOfl/deadOTX +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCellDeadOTXCorr[0x3cbec820]+89 bound to /LAR/CellCorrOfl/deadOTX ToolSvc.tool1 INFO L1Calo database won't be used. Pedestal values will be constant and equal to 32. ClassIDSvc INFO getRegistryEntries: read 64 CLIDRegistry entries for module ALL -IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingService[0x2cb71200]+7fb4ded5e650 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap] +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingService[0x2cb71200]+7fb4ded5e650 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap] ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/OnOffIdMap ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/CalibIdMap ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/FebRodMap @@ -339,7 +339,7 @@ ClassIDSvc INFO getRegistryEntries: read 59 CLIDRegistry entries for ToolSvc.CaloTri... INFO ====> ...CaloTriggerTowerService::init() OK ToolSvc.deadotx... INFO Read 0 lines in total (for all COOL channels and missing FEBs together) ToolSvc.tool2 INFO Initializing LArCellDeadOTXCorr -IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCellDeadOTXCorr[0x6d3e820]+89 bound to /LAR/CellCorrOfl/deadOTX +IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCellDeadOTXCorr[0x6d3e820]+89 bound to /LAR/CellCorrOfl/deadOTX ToolSvc.tool2 INFO L1Calo database won't be used. Pedestal values will be constant and equal to 32. ToolSvc.deadotx... INFO Decoded 3 lines from FEB file deadotx_badchan2.badfebs ToolSvc.deadotx... INFO Read 3 lines in total (for all COOL channels and missing FEBs together) diff --git a/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref b/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref index bf7ff84450be8c1c09fba0d82df4e8cded9a9d64..f89cb97e8488963bb5806a03994032c27d9e5d04 100644 --- a/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref +++ b/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref @@ -60,7 +60,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200 diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref index 429ef655236bae197df80479e1db58845b980287..707265564d13d2edb793970fa20e6c28e1d05c17 100644 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref @@ -78,7 +78,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200 diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref index 7789d94d7cac14fc98c61c20330fb7a6d9c407ce..6a898c7b1ccf976fd53c088ba18bdcf942fce3da 100644 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref @@ -103,7 +103,7 @@ RootDatabase.open INFO LarCondTestNoReg.root File version:61600 IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200 diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref index 4d8a9c41d5dea77f1836638ae3f8162e554cadd6..4dbeec53e14cb51d334455dc2b3a29a68fa63ab2 100644 --- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref +++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref @@ -79,7 +79,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200 diff --git a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref index 10f1163e596a0b1747e9284a5f25695ff9458d2e..881f6d03486a8bf3af546ce0f189e9acb9de2571 100644 --- a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref +++ b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref @@ -123,7 +123,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200 diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref index d9f6d4324c193b682ee62c588a01546817e50b26..9e62ced6229baa51e167873669213596d98e0b04 100644 --- a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref +++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref @@ -65,7 +65,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref index 7e9a2c0a69900dbfff42b139a67f2dace34e9210..da1b541c331f75ef9e2ec617d5b74996cafb415e 100644 --- a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref +++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref @@ -65,7 +65,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref index dc4319bf028f002788d07fa52a04e94cbc9bec1d..2057e2e72bcea1ce759ec2da683f562d9d7af692 100644 --- a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref +++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref @@ -65,7 +65,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref index 6d6972f52eec6556ac3d3b30ef02e477e4c3ed56..388373da441654bb086777ff4250c6e8a0ea3873 100644 --- a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref +++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref @@ -65,7 +65,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref index dc2a2c767e9b8eab28a9ed4cde853991d14fdf14..70bdcd713b312fc0fcb0c5906659bc927814d4dd 100644 --- a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref +++ b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref @@ -65,7 +65,7 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found. IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref index 38e6eb72b2eb61d94a399a9376f482a5cf0950a0..d87d9781dd7c0001e392731f0c80762ccbfd0f2d 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref +++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref @@ -71,7 +71,7 @@ IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 @@ -721,7 +721,7 @@ IOVDbSvc INFO preLoadAddresses: Removi IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref index 8bf2f543ce60f8394d7b4c364af0d96a9a99d82b..2c608fde03265918d30977a56a57d406b938aa9b 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref +++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref @@ -72,7 +72,7 @@ IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL ClassIDSvc INFO getRegistryEntries: read 830 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 @@ -724,7 +724,7 @@ IOVDbSvc INFO Opening COOL connection ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL ClassIDSvc INFO getRegistryEntries: read 768 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref index eb0bdd940f71c68c13c28a3d55a8642f6ffa1914..5ed8bd0688917443207eaf2bfe36044d7cc40927 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref +++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref @@ -71,7 +71,7 @@ IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 @@ -722,7 +722,7 @@ IOVDbSvc INFO preLoadAddresses: Removi IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref index 088cde6cc6e3eb376ba103ce0796ec79914c19bf..e3595071cb024f74bb3a451f6886a8be661df701 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref +++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref @@ -71,7 +71,7 @@ IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 @@ -720,7 +720,7 @@ IOVDbSvc INFO preLoadAddresses: Removi IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref index 86599d8f0e47186a505e59c6ed8fc36f19842aaa..b4a74eb79a432b1f129b7dc34e1cd815cd7ed6db 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref +++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref @@ -71,7 +71,7 @@ IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 @@ -723,7 +723,7 @@ IOVDbSvc INFO preLoadAddresses: Removi IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref index 2407ec19221b5ffe0116e9916a6a3ceef6c0816a..fe730f4e092ba71135a881445f37fa4017bae4c9 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref +++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref @@ -72,7 +72,7 @@ IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200 ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL ClassIDSvc INFO getRegistryEntries: read 830 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 @@ -724,7 +724,7 @@ IOVDbSvc INFO Opening COOL connection ClassIDSvc INFO getRegistryEntries: read 3213 CLIDRegistry entries for module ALL ClassIDSvc INFO getRegistryEntries: read 768 CLIDRegistry entries for module ALL IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc" -IOVSvcTool INFO IOVRanges will be checked at every Event +IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200 IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200 diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/checklogTrigUpgradeTest.conf b/Trigger/TrigValidation/TrigUpgradeTest/share/checklogTrigUpgradeTest.conf index 837406fd9c31591a703cf4456c7152e81fb70785..2b022d608574077685f7e1601c994eb720115b12 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/checklogTrigUpgradeTest.conf +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/checklogTrigUpgradeTest.conf @@ -3,7 +3,6 @@ ignore 'DEBUG Trailer: xxx Trailer*' ignore 'Failed to get SCT_FlaggedCondData_TRIG' ignore 'SCT_FlaggedCondData cannot be retrieved' ignore 'Cannot update Conditions via callback functions in MT after the first event' -ignore 'Exception with tag=IOVSvc.StoreGateSvc is caught handling incidentBeginEvent' +ignore 'Exception with tag=IOVSvc.IOVSvcTool is caught handling incidentBeginEvent' ignore 'attempt to add a duplicate.*dupe ignored' ignore 'IOVSvcTool.*CLID=.*name=.*' -