diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 2fcb402ce32c490faafbed9e4340046f43addef7..0edc332c146119e61607ff7f3b9066280cffb52e 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -734,12 +734,9 @@ class ComponentAccumulator(object):
bsh.setProperty(msp, k.encode(), v.encode())
# Feed the jobO service with the remaining options
- jos = app.getService("JobOptionsSvc")
for comp, name, value in bshPropsToSet:
self._msg.debug("Adding %s.%s = %s", comp, name, value)
- bsh.addPropertyToCatalogue(
- jos, comp.encode(), name.encode(), value.encode()
- )
+ app.setOption(f"{comp}.{name}", value)
sys.stdout.flush()
return app
diff --git a/Control/AthenaKernel/AthenaKernel/AthenaKernelDict.h b/Control/AthenaKernel/AthenaKernel/AthenaKernelDict.h
index 59ff7329823b44bdbcc129e4bb27f71e7c3d623e..9aebd8ce574522b5b4f9f85aa53832d84670fced 100644
--- a/Control/AthenaKernel/AthenaKernel/AthenaKernelDict.h
+++ b/Control/AthenaKernel/AthenaKernel/AthenaKernelDict.h
@@ -1,7 +1,7 @@
// dear emacs, this is -*- C++ -*-
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHENAKERNEL_ATHENAKERNELDICT_H
@@ -24,7 +24,6 @@
#include "AthenaKernel/DsoDb.h"
#include "AthenaKernel/AthDsoUtils.h"
-#include "AthenaKernel/tools/AthenaPackageInfo.h"
#include "AthenaKernel/DataBucketBase.h"
#include "AthenaKernel/ThinningDecisionBase.h"
#include "AthenaKernel/CondCont.h"
diff --git a/Control/AthenaKernel/AthenaKernel/selection.xml b/Control/AthenaKernel/AthenaKernel/selection.xml
index de4026969fcd33d98752b8859d72351e619423e2..50b4f937a058682704c1039fae652b6570de6e2c 100644
--- a/Control/AthenaKernel/AthenaKernel/selection.xml
+++ b/Control/AthenaKernel/AthenaKernel/selection.xml
@@ -20,7 +20,6 @@
<class name="Ath::DsoDb::DsoMap_t" />
<function name="Athena::DsoUtils::inDso" />
- <function name="Athena::PackageInfo" />
<class name="SG::BaseInfoBase" />
diff --git a/Control/AthenaKernel/AthenaKernel/tools/AthenaPackageInfo.h b/Control/AthenaKernel/AthenaKernel/tools/AthenaPackageInfo.h
deleted file mode 100644
index a658124a5f19d8dfddc61c9fbb772012eee47abc..0000000000000000000000000000000000000000
--- a/Control/AthenaKernel/AthenaKernel/tools/AthenaPackageInfo.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef ATHENAKERNEL_TOOLS_ATHENA_PACKAGEINFO_H
-#define ATHENAKERNEL_TOOLS_ATHENA_PACKAGEINFO_H 1
-
-#include <string>
-
-namespace Athena {
-
-/**
- * @class PackageInfo
- * @author Paolo Calafiura
- * @brief decodes cmt PACKAGE_VERSION macro (deprecated)
- *
- * As of April 2021 this is a dummy class as the package information is no
- * longer stored in the CLID database (ATEAM-731). It can be deleted once
- * the IClassIDSvc interface has been cleaned up.
- */
- class PackageInfo {
- public:
- PackageInfo(const std::string&) {}
- };
-}
-
-#endif
diff --git a/Control/AthenaServices/share/AthTPCnvSvc_test.py b/Control/AthenaServices/share/AthTPCnvSvc_test.py
index 26861c78e537b56e48e36031d1b6dab0de2baf04..21eeac4c8735ab4c2ad0e268fdbf8901a947656a 100644
--- a/Control/AthenaServices/share/AthTPCnvSvc_test.py
+++ b/Control/AthenaServices/share/AthTPCnvSvc_test.py
@@ -4,14 +4,13 @@ theApp.EvtMax = 1
theApp.initialize()
tpsvc=PyAthena.py_svc('AthTPCnvSvc',True,'ITPCnvSvc')
-pi=PyAthena.Athena.PackageInfo('AthenaServicesTest-00-00-00')
clidsvc=PyAthena.py_svc('ClassIDSvc',True,'IClassIDSvc')
-clidsvc.setTypePackageForID(20394829,'AthenaServicesTestConverters::TA',pi,'AthenaServicesTestConverters::TA')
-clidsvc.setTypePackageForID(20394828,'xxx',pi,'AthenaServicesTestConverters::TA')
-clidsvc.setTypePackageForID(20394827,'AthenaServicesTestConverters::TB',pi,'AthenaServicesTestConverters::TB')
-clidsvc.setTypePackageForID(20394826,'yyy',pi,'AthenaServicesTestConverters::TB')
-clidsvc.setTypePackageForID(20394825,'AthenaServicesTestConverters::TBTRIG',pi,'AthenaServicesTestConverters::TBTRIG')
-clidsvc.setTypePackageForID(20394824,'zzz',pi,'AthenaServicesTestConverters::TBTRIG')
+clidsvc.setTypeForID(20394829,'AthenaServicesTestConverters::TA','AthenaServicesTestConverters::TA')
+clidsvc.setTypeForID(20394828,'xxx','AthenaServicesTestConverters::TA')
+clidsvc.setTypeForID(20394827,'AthenaServicesTestConverters::TB','AthenaServicesTestConverters::TB')
+clidsvc.setTypeForID(20394826,'yyy','AthenaServicesTestConverters::TB')
+clidsvc.setTypeForID(20394825,'AthenaServicesTestConverters::TBTRIG','AthenaServicesTestConverters::TBTRIG')
+clidsvc.setTypeForID(20394824,'zzz','AthenaServicesTestConverters::TBTRIG')
def getname(cnv):
if not cnv:
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.cxx b/Control/AthenaServices/src/LoggedMessageSvc.cxx
index d744520d5ac517546337b0a3cb6e2b418562b784..57934e7a567a8241999d3b34c33ffe2246ecbd85 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.cxx
+++ b/Control/AthenaServices/src/LoggedMessageSvc.cxx
@@ -604,22 +604,9 @@ void LoggedMessageSvc::reportMessage( const Message& msg ) {
// Purpose: dispatches a message to the relevant streams.
// ---------------------------------------------------------------------------
//
-void LoggedMessageSvc::reportMessage (const char* source,
- int type,
- const char* message) {
- Message msg( source, type, message);
- reportMessage( msg );
-}
-
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: reportMessage
-// Purpose: dispatches a message to the relevant streams.
-// ---------------------------------------------------------------------------
-//
-void LoggedMessageSvc::reportMessage (const std::string& source,
- int type,
- const std::string& message) {
+void LoggedMessageSvc::reportMessage (std::string source,
+ int type,
+ std::string message) {
Message msg( source, type, message);
reportMessage( msg );
}
@@ -632,7 +619,7 @@ void LoggedMessageSvc::reportMessage (const std::string& source,
//
void LoggedMessageSvc::reportMessage (const StatusCode& key,
- const std::string& source)
+ std::string_view source)
{
std::lock_guard<std::recursive_mutex> lock(m_messageMapMutex);
@@ -644,7 +631,7 @@ void LoggedMessageSvc::reportMessage (const StatusCode& key,
msg.setSource( source );
std::ostringstream os1;
os1 << "Status Code " << key.getCode() << std::ends;
- Message stat_code1( source, msg.getType(), os1.str() );
+ Message stat_code1( std::string{source}, msg.getType(), os1.str() );
reportMessage( stat_code1 );
reportMessage( msg );
first++;
@@ -655,7 +642,7 @@ void LoggedMessageSvc::reportMessage (const StatusCode& key,
mesg.setSource( source );
std::ostringstream os2;
os2 << "Status Code " << key.getCode() << std::ends;
- Message stat_code2( source, mesg.getType(), os2.str() );
+ Message stat_code2( std::string{source}, mesg.getType(), os2.str() );
reportMessage( stat_code2 );
reportMessage( mesg );
}
@@ -757,12 +744,11 @@ void LoggedMessageSvc::eraseStream( std::ostream* stream ) {
// ---------------------------------------------------------------------------
//
-void LoggedMessageSvc::insertMessage( const StatusCode& key, const Message& msg )
+void LoggedMessageSvc::insertMessage( const StatusCode& key, Message msg )
{
std::lock_guard<std::recursive_mutex> lock(m_messageMapMutex);
- typedef MessageMap::value_type value_type;
- m_messageMap.insert( value_type( key, msg ) );
+ m_messageMap.emplace( key, std::move( msg ) );
}
//#############################################################################
@@ -890,10 +876,13 @@ int LoggedMessageSvc::messageCount( MSG::Level level) const {
// ---------------------------------------------------------------------------
void
-LoggedMessageSvc::incrInactiveCount(MSG::Level level, const std::string& source) {
-
- ++(m_inactiveMap[source].msg[level]);
+LoggedMessageSvc::incrInactiveCount(MSG::Level level, std::string_view source) {
+ auto entry = m_inactiveMap.find( source );
+ if ( entry == m_inactiveMap.end() ) {
+ entry = m_inactiveMap.emplace( source, MsgAry{} ).first;
+ }
+ ++entry->second.msg[level];
}
// ---------------------------------------------------------------------------
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.h b/Control/AthenaServices/src/LoggedMessageSvc.h
index 93581ba9721978933d2e71f1a7ea0273e5032e14..7b61d78fd98b77d16bbff62cceeaf8fe01cc643f 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.h
+++ b/Control/AthenaServices/src/LoggedMessageSvc.h
@@ -22,8 +22,6 @@
#include "AthenaKernel/ILoggedMessageSvc.h"
#include "CxxUtils/checker_macros.h"
-#include <boost/array.hpp>
-
// Forward declarations
class ISvcLocator;
@@ -51,96 +49,93 @@ public:
virtual ~LoggedMessageSvc();
// Implementation of IService::reinitialize()
- virtual StatusCode reinitialize();
+ virtual StatusCode reinitialize() override;
// Implementation of IService::initialize()
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
// Implementation of IService::finalize()
- virtual StatusCode finalize();
-
- // Implementation of IMessageSvc::reportMessage()
- virtual void reportMessage( const Message& message );
+ virtual StatusCode finalize() override;
// Implementation of IMessageSvc::reportMessage()
- virtual void reportMessage( const Message& msg, int outputLevel );
+ virtual void reportMessage( const Message& message ) override;
// Implementation of IMessageSvc::reportMessage()
- virtual void reportMessage( const StatusCode& code, const std::string& source = "");
+ virtual void reportMessage( const Message& msg, int outputLevel ) override;
// Implementation of IMessageSvc::reportMessage()
- virtual void reportMessage( const char* source, int type, const char* message);
+ virtual void reportMessage( const StatusCode& code, std::string_view source = "") override;
// Implementation of IMessageSvc::reportMessage()
- virtual void reportMessage( const std::string& source, int type, const std::string& message);
+ virtual void reportMessage( std::string source, int type, std::string message) override;
// Implementation of IMessageSvc::insertMessage()
- virtual void insertMessage( const StatusCode& code, const Message& message );
+ virtual void insertMessage( const StatusCode& code, Message message ) override;
// Implementation of IMessageSvc::eraseMessage()
- virtual void eraseMessage();
+ virtual void eraseMessage() override;
// Implementation of IMessageSvc::eraseMessage()
- virtual void eraseMessage( const StatusCode& code ) ;
+ virtual void eraseMessage( const StatusCode& code ) override;
// Implementation of IMessageSvc::eraseMessage()
- virtual void eraseMessage( const StatusCode& code, const Message& message );
+ virtual void eraseMessage( const StatusCode& code, const Message& message ) override;
// Implementation of IMessageSvc::insertStream()
- virtual void insertStream( int message_type, std::string name, std::ostream* stream );
+ virtual void insertStream( int message_type, std::string name, std::ostream* stream ) override;
// Implementation of IMessageSvc::eraseStream()
- virtual void eraseStream();
+ virtual void eraseStream() override;
// Implementation of IMessageSvc::eraseStream()
- virtual void eraseStream( int message_type );
+ virtual void eraseStream( int message_type ) override;
// Implementation of IMessageSvc::eraseStream()
- virtual void eraseStream( int message_type, std::ostream* stream );
+ virtual void eraseStream( int message_type, std::ostream* stream ) override;
// Implementation of IMessageSvc::eraseStream()
- virtual void eraseStream( std::ostream* stream );
+ virtual void eraseStream( std::ostream* stream ) override;
// Implementation of IMessageSvc::defaultStream()
- virtual std::ostream* defaultStream ATLAS_NOT_CONST_THREAD_SAFE () const {
+ virtual std::ostream* defaultStream ATLAS_NOT_CONST_THREAD_SAFE () const override {
return m_defaultStream;
}
// Implementation of IMessageSvc::setDefaultStream()
- virtual void setDefaultStream( std::ostream* stream ) {
+ virtual void setDefaultStream( std::ostream* stream ) override {
std::lock_guard<std::mutex> lock(m_reportMutex);
m_defaultStream = stream;
}
// Implementation of IMessageSvc::ouputLevel()
- virtual int outputLevel() const;
+ virtual int outputLevel() const override;
// Implementation of IMessageSvc::ouputLevel()
- virtual int outputLevel(std::string_view source) const;
+ virtual int outputLevel(std::string_view source) const override;
// Implementation of IMessageSvc::setOuputLevel()
- virtual void setOutputLevel(int new_level);
+ virtual void setOutputLevel(int new_level) override;
// Implementation of IMessageSvc::setOuputLevel()
- virtual void setOutputLevel(std::string_view source, int new_level);
+ virtual void setOutputLevel(std::string_view source, int new_level) override;
// Implementation of IInterface::queryInterface()
- virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvUnknown);
+ virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvUnknown) override;
// Implementation of IMessageSvc::useColor()
- virtual bool useColor() const { return m_color; }
+ virtual bool useColor() const override { return m_color; }
// Implementation of IMessageSvc::getLogColor()
- virtual std::string getLogColor(int logLevel) const;
+ virtual std::string getLogColor(int logLevel) const override;
// Implementation of IMessageSvc::messageCount()
- virtual int messageCount( MSG::Level logLevel ) const;
+ virtual int messageCount( MSG::Level logLevel ) const override;
// Implementation of IInactiveMessageCounter::incrInactiveCount()
virtual void incrInactiveCount( MSG::Level level,
- const std::string& src );
+ std::string_view src ) override;
- virtual const std::vector< std::pair<std::string, std::string> >& getMessages( MSG::Level level) const;
+ virtual const std::vector< std::pair<std::string, std::string> >& getMessages( MSG::Level level) const override;
- virtual const std::vector< LoggedMessage >& getKeyMessages() const { return m_msgKeyLog; }
+ virtual const std::vector< LoggedMessage >& getKeyMessages() const override { return m_msgKeyLog; }
private:
std::ostream* m_defaultStream; ///< Pointer to the output stream.
@@ -162,22 +157,14 @@ private:
std::string m_logColorCodes[MSG::NUM_LEVELS];
/// Private helper class to keep the count of messages of a type (MSG::LEVEL).
- struct MsgAry {
- /// Simple typedef for readability.
- typedef boost::array<int,MSG::NUM_LEVELS> ArrayType;
+ struct MsgAry final {
/// Internal array of counters.
- ArrayType msg;
+ std::array<int, MSG::NUM_LEVELS> msg = {{0}};
/// Default constructor.
- MsgAry() {
- // This is a special hack to have a fast initialization of the array
- // because we cannot use initializer lists in the constructor (should be
- // possible in C++0X).
- static const ArrayType zero = {{0}};
- msg = zero;
- }
+ MsgAry() = default;
};
- std::map<std::string,MsgAry> m_sourceMap, m_inactiveMap;
+ std::map<std::string, MsgAry, std::less<>> m_sourceMap, m_inactiveMap;
BooleanProperty m_suppress, m_inactCount;
std::string colTrans(std::string, int);
diff --git a/Control/CLIDComps/src/ClassIDSvc.cxx b/Control/CLIDComps/src/ClassIDSvc.cxx
index 0b138cf4415ec5a04da361932de4a8273db5a2b7..f4c04e39550763e9d45e41d9d34a90413fd7b863 100644
--- a/Control/CLIDComps/src/ClassIDSvc.cxx
+++ b/Control/CLIDComps/src/ClassIDSvc.cxx
@@ -179,10 +179,9 @@ ClassIDSvc::getIDOfTypeInfoName(const std::string& typeInfoName,
/// associate type name with clID
StatusCode
-ClassIDSvc::setTypePackageForID(const CLID& id,
- const std::string& typeName,
- const Athena::PackageInfo&,
- const std::string& typeInfoName)
+ClassIDSvc::setTypeForID(const CLID& id,
+ const std::string& typeName,
+ const std::string& typeInfoName)
{
lock_t lock (m_mutex);
if (id < CLIDdetail::MINCLID || id > CLIDdetail::MAXCLID) {
@@ -257,26 +256,6 @@ ClassIDSvc::finalize()
return Service::finalize();
}
-// Query the interfaces.
-// Input: riid, Requested interface ID
-// ppvInterface, Pointer to requested interface
-// Return: StatusCode indicating SUCCESS or FAILURE.
-// N.B. Don't forget to release the interface after use!!!
-
-StatusCode
-ClassIDSvc::queryInterface(const InterfaceID& riid, void** ppvInterface)
-{
- if ( IClassIDSvc::interfaceID().versionMatch(riid) ) {
- *ppvInterface = (IClassIDSvc*)this;
- }
- else {
- // Interface is not directly available: try out a base class
- return Service::queryInterface(riid, ppvInterface);
- }
- addRef();
- return StatusCode::SUCCESS;
-}
-
void ClassIDSvc::handle(const Incident &inc)
{
@@ -289,7 +268,7 @@ void ClassIDSvc::handle(const Incident &inc)
/// Standard Constructor
ClassIDSvc::ClassIDSvc(const std::string& name,ISvcLocator* svc)
- : Service(name,svc),
+ : base_class(name,svc),
m_clidDBPath(System::getEnv("DATAPATH"))
{
}
diff --git a/Control/CLIDComps/src/ClassIDSvc.h b/Control/CLIDComps/src/ClassIDSvc.h
index 58672266fa9fc5b5f697d1c4f2878bf35cbd9b99..d90b74a988f7d8fa90365a7fc6f2d532a705fc86 100644
--- a/Control/CLIDComps/src/ClassIDSvc.h
+++ b/Control/CLIDComps/src/ClassIDSvc.h
@@ -33,9 +33,7 @@
* "OutputFileName" at finalize time.
*/
-class ClassIDSvc : virtual public IClassIDSvc,
- virtual public IIncidentListener,
- public Service
+class ClassIDSvc : public extends<Service, IClassIDSvc, IIncidentListener>
{
private:
typedef std::pair<std::string, std::string> TypeName; //typename+typeinfoname
@@ -65,16 +63,10 @@ public:
virtual StatusCode getIDOfTypeName(const std::string& typeName, CLID& id) const override;
/// get id associated with type-info name (if any)
virtual StatusCode getIDOfTypeInfoName(const std::string& typeInfoName, CLID& id) const override;
- /// get type name associated with clID (if any)
- virtual StatusCode getPackageInfoForID(const CLID&, Athena::PackageInfo&) const override {
- throw std::runtime_error("getPackageInfoForID is no longer supported");
- return StatusCode::FAILURE;
- }
/// associate type name, package info and type-info name with clID
- virtual StatusCode setTypePackageForID(const CLID& id,
- const std::string& typeName,
- const Athena::PackageInfo&,
- const std::string& typeInfoName) override;
+ virtual StatusCode setTypeForID(const CLID& id,
+ const std::string& typeName,
+ const std::string& typeInfoName = "") override;
//========================================================================
/** @name Debugging methods. */
@@ -92,7 +84,6 @@ public:
virtual StatusCode reinitialize() override;
///dump CLIDmap to outputFileName;
virtual StatusCode finalize() override;
- virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
//@}
///implement IIncidentListener
diff --git a/Control/CLIDComps/test/ClassIDSvc_test.cxx b/Control/CLIDComps/test/ClassIDSvc_test.cxx
index c0eda4962dae4abd204ddde34feffa6c129709aa..994766dd3ea1537a3c1cfe8f3e962c5a71f65e66 100644
--- a/Control/CLIDComps/test/ClassIDSvc_test.cxx
+++ b/Control/CLIDComps/test/ClassIDSvc_test.cxx
@@ -22,7 +22,6 @@
#include "AthenaKernel/CLASS_DEF.h"
#include "AthenaKernel/CLIDRegistry.h"
-#include "AthenaKernel/tools/AthenaPackageInfo.h"
class Foo{};
CLASS_DEF( Foo, 8101, 0)
@@ -68,28 +67,24 @@ void basic_test(ISvcLocator* pSvcLoc) {
assert(pClassIDSvc);
assert(pClassIDSvc->nextAvailableID() == CLIDdetail::MINCLID);
- Athena::PackageInfo info(ATLAS_PACKAGE_NAME);
- Athena::PackageInfo info2("APackage");
- assert(pClassIDSvc->setTypePackageForID(7890, "Bla", info2).isSuccess());
- ASSERTERROR(pClassIDSvc->setTypePackageForID(CLIDdetail::MINCLID/2, "No",
- info).isSuccess());
- ASSERTERROR(pClassIDSvc->setTypePackageForID(CLIDdetail::MAXCLID*2, "Nah",
- info).isSuccess());
+ assert(pClassIDSvc->setTypeForID(7890, "Bla").isSuccess());
+ ASSERTERROR(pClassIDSvc->setTypeForID(CLIDdetail::MINCLID/2, "No").isSuccess());
+ ASSERTERROR(pClassIDSvc->setTypeForID(CLIDdetail::MAXCLID*2, "Nah").isSuccess());
//FIXME is this an issue? Should we do the reverse check type -> id?
- assert(pClassIDSvc->setTypePackageForID(9942, "Bli", info).isSuccess());
- assert(pClassIDSvc->setTypePackageForID(9943, "Blu", info).isSuccess());
- ASSERTERROR(pClassIDSvc->setTypePackageForID(7890, "Ble", info).isSuccess());
- //check disabled ASSERTERROR(pClassIDSvc->setTypePackageForID(9942, "Bli", info2).isSuccess());
- ASSERTERROR(pClassIDSvc->setTypePackageForID(9945, "Bli", info).isSuccess());
- assert(pClassIDSvc->setTypePackageForID(7890, "Bla", info2).isSuccess());
- assert(pClassIDSvc->setTypePackageForID(7890, " Bla", info2).isSuccess());
- ASSERTERROR(pClassIDSvc->setTypePackageForID(7890, " Bl a ", info2).isSuccess());
- ASSERTERROR(pClassIDSvc->setTypePackageForID(7890, " B l a ", info2).isSuccess());
- assert(pClassIDSvc->setTypePackageForID(7890, "Bla ", info2).isSuccess());
- assert(pClassIDSvc->setTypePackageForID(7890, " Bla ", info2).isSuccess());
-
- assert(pClassIDSvc->setTypePackageForID(9944, "Blo", info, "BloTypeInfo").isSuccess());
- ASSERTERROR(pClassIDSvc->setTypePackageForID(9946, "Blo2", info, "BloTypeInfo").isSuccess());
+ assert(pClassIDSvc->setTypeForID(9942, "Bli").isSuccess());
+ assert(pClassIDSvc->setTypeForID(9943, "Blu").isSuccess());
+ ASSERTERROR(pClassIDSvc->setTypeForID(7890, "Ble").isSuccess());
+ //check disabled ASSERTERROR(pClassIDSvc->setTypeForID(9942, "Bli").isSuccess());
+ ASSERTERROR(pClassIDSvc->setTypeForID(9945, "Bli").isSuccess());
+ assert(pClassIDSvc->setTypeForID(7890, "Bla").isSuccess());
+ assert(pClassIDSvc->setTypeForID(7890, " Bla").isSuccess());
+ ASSERTERROR(pClassIDSvc->setTypeForID(7890, " Bl a ").isSuccess());
+ ASSERTERROR(pClassIDSvc->setTypeForID(7890, " B l a ").isSuccess());
+ assert(pClassIDSvc->setTypeForID(7890, "Bla ").isSuccess());
+ assert(pClassIDSvc->setTypeForID(7890, " Bla ").isSuccess());
+
+ assert(pClassIDSvc->setTypeForID(9944, "Blo", "BloTypeInfo").isSuccess());
+ ASSERTERROR(pClassIDSvc->setTypeForID(9946, "Blo2", "BloTypeInfo").isSuccess());
string name;
assert(pClassIDSvc->getTypeNameOfID(8101, name).isSuccess());
diff --git a/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref b/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
index 69741b11283e2304f7d81d92109d025aeb2ec911..f459ae900acf07ac0dcbccbba80be6f8a5dc5a2b 100644
--- a/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
@@ -130,9 +130,9 @@ AvalancheSchedulerSvc 0 INFO Data Depe
IncidentProcAlg3
none
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'EventInfo' , 'StoreGateSvc+McEventInfo' ) required by Algorithm:
- * DMTest::CondReaderAlg
- * xAODMaker::EventInfoCnvAlg
+AvalancheSchedulerSvc 0 INFO o ( 'EventInfo' , 'StoreGateSvc+McEventInfo' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * DMTest::CondReaderAlg
+AvalancheSchedulerSvc 0 INFO * xAODMaker::EventInfoCnvAlg
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceRulesGraph 0 INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
index d19349cd4306fbe2dbde0edaa67a7b02f32cbbe2..8d1a1d5fb4b9abd17c292a0c7efd61ac2b7f6000 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
@@ -115,12 +115,12 @@ AvalancheSchedulerSvc 0 INFO Data Depe
IncidentProcAlg3
none
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'EventInfo' , 'StoreGateSvc+McEventInfo' ) required by Algorithm:
- * xAODMaker::EventInfoCnvAlg
- * xAODTestDecor
- * xAODTestWriteCInfo
- o ( 'SG::AuxElement' , 'StoreGateSvc+scopy_cinfo.dInt1Base' ) required by Algorithm:
- * xAODTestReadDecorSCopy
+AvalancheSchedulerSvc 0 INFO o ( 'EventInfo' , 'StoreGateSvc+McEventInfo' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODMaker::EventInfoCnvAlg
+AvalancheSchedulerSvc 0 INFO * xAODTestDecor
+AvalancheSchedulerSvc 0 INFO * xAODTestWriteCInfo
+AvalancheSchedulerSvc 0 INFO o ( 'SG::AuxElement' , 'StoreGateSvc+scopy_cinfo.dInt1Base' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadDecorSCopy
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
AvalancheSchedulerSvc 0 INFO Concurrency level information:
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
index dedf30ae84fa450aaf0cadd90efada5cf21c54ff..99405423ff8cae4a04aad138203e5cb4a283b7f7 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
@@ -110,12 +110,12 @@ AvalancheSchedulerSvc 0 INFO Data Depe
IncidentProcAlg3
none
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'DMTest::CVec' , 'StoreGateSvc+cvec.dInt1' ) required by Algorithm:
- * xAODTestReadDecor
- o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1' ) required by Algorithm:
- * xAODTestReadDecor
- o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1Base' ) required by Algorithm:
- * xAODTestReadDecor
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CVec' , 'StoreGateSvc+cvec.dInt1' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadDecor
+AvalancheSchedulerSvc 0 INFO o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadDecor
+AvalancheSchedulerSvc 0 INFO o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1Base' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadDecor
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
AvalancheSchedulerSvc 0 INFO Concurrency level information:
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
index df7a0013be3c77f87f3dc4f93561cf973eaf916f..a54208377f385008739c30f93d76b624532625d4 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
@@ -132,32 +132,32 @@ AvalancheSchedulerSvc 0 INFO Data Depe
IncidentProcAlg3
none
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'DMTest::C' , 'StoreGateSvc+cinfo' ) required by Algorithm:
- * xAODTestReadCInfo
- o ( 'DMTest::C' , 'StoreGateSvc+copy_cinfo' ) required by Algorithm:
- * xAODTestReadCInfo_copy
- o ( 'DMTest::CVec' , 'StoreGateSvc+copy_ctrig' ) required by Algorithm:
- * xAODTestRead_copy
- o ( 'DMTest::CVec' , 'StoreGateSvc+copy_cvec' ) required by Algorithm:
- * xAODTestReadCVec_copy
- o ( 'DMTest::CVec' , 'StoreGateSvc+ctrig' ) required by Algorithm:
- * xAODTestRead
- o ( 'DMTest::CVecWithData' , 'StoreGateSvc+copy_cvecWD' ) required by Algorithm:
- * xAODTestRead_copy
- o ( 'DMTest::CVecWithData' , 'StoreGateSvc+cvecWD' ) required by Algorithm:
- * xAODTestRead
- o ( 'DMTest::CView' , 'StoreGateSvc+copy_cview' ) required by Algorithm:
- * xAODTestReadCView_copy
- o ( 'DMTest::CView' , 'StoreGateSvc+cview' ) required by Algorithm:
- * xAODTestReadCView
- o ( 'DMTest::HVec' , 'StoreGateSvc+copy_hvec' ) required by Algorithm:
- * xAODTestReadHVec_copy
- o ( 'DMTest::HVec' , 'StoreGateSvc+copy_hview' ) required by Algorithm:
- * xAODTestReadHVec_copy
- o ( 'DMTest::HVec' , 'StoreGateSvc+hvec' ) required by Algorithm:
- * xAODTestReadHVec
- o ( 'DMTest::HVec' , 'StoreGateSvc+hview' ) required by Algorithm:
- * xAODTestReadHVec
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::C' , 'StoreGateSvc+cinfo' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadCInfo
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::C' , 'StoreGateSvc+copy_cinfo' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadCInfo_copy
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CVec' , 'StoreGateSvc+copy_ctrig' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestRead_copy
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CVec' , 'StoreGateSvc+copy_cvec' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadCVec_copy
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CVec' , 'StoreGateSvc+ctrig' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestRead
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CVecWithData' , 'StoreGateSvc+copy_cvecWD' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestRead_copy
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CVecWithData' , 'StoreGateSvc+cvecWD' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestRead
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CView' , 'StoreGateSvc+copy_cview' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadCView_copy
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CView' , 'StoreGateSvc+cview' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadCView
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::HVec' , 'StoreGateSvc+copy_hvec' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadHVec_copy
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::HVec' , 'StoreGateSvc+copy_hview' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadHVec_copy
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::HVec' , 'StoreGateSvc+hvec' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadHVec
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::HVec' , 'StoreGateSvc+hview' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadHVec
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
AvalancheSchedulerSvc 0 INFO Concurrency level information:
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadRenameMT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadRenameMT.ref
index 91335c09dbebbb5aedec65290f0203697cb29af3..ee25f40ef176ab0e82159be74e018e89ca1033b5 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadRenameMT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadRenameMT.ref
@@ -89,14 +89,14 @@ ThreadPoolSvc 0 INFO no thread
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
AvalancheSchedulerSvc 0 INFO Found 10 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'DMTest::CVec' , 'StoreGateSvc+cvec_renamed' ) required by Algorithm:
- * xAODTestReadCVec
- o ( 'DMTest::CVec' , 'StoreGateSvc+cvec_renamed.dInt1_renamed' ) required by Algorithm:
- * xAODTestReadDecor
- o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1_renamed' ) required by Algorithm:
- * xAODTestReadDecor
- o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1_renamedBase' ) required by Algorithm:
- * xAODTestReadDecor
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CVec' , 'StoreGateSvc+cvec_renamed' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadCVec
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::CVec' , 'StoreGateSvc+cvec_renamed.dInt1_renamed' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadDecor
+AvalancheSchedulerSvc 0 INFO o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1_renamed' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadDecor
+AvalancheSchedulerSvc 0 INFO o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1_renamedBase' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadDecor
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
AvalancheSchedulerSvc 0 INFO Concurrency level information:
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
index 5f0bf6845f40f2758822fec5cd97ffc7168bd574..eece7f61a2178358eb634cc01cab1e04c70cdede 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
@@ -98,9 +98,9 @@ AvalancheSchedulerSvc 0 INFO Data Depe
IncidentProcAlg3
none
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'EventInfo' , 'StoreGateSvc+McEventInfo' ) required by Algorithm:
- * xAODMaker::EventInfoCnvAlg
- * xAODTestWriteCInfo
+AvalancheSchedulerSvc 0 INFO o ( 'EventInfo' , 'StoreGateSvc+McEventInfo' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODMaker::EventInfoCnvAlg
+AvalancheSchedulerSvc 0 INFO * xAODTestWriteCInfo
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
AvalancheSchedulerSvc 0 INFO Concurrency level information:
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
index e21b4ab57b92b3259f7b7f5a8c3e33ab9cb13dbf..9f5ccf411d7fa06b71d6fd6ffacea582b6c65a86 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
@@ -111,14 +111,14 @@ AvalancheSchedulerSvc 0 INFO Data Depe
IncidentProcAlg3
none
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'DMTest::S1' , 'StoreGateSvc+S2' ) required by Algorithm:
- * xAODTestReadSymlink
- o ( 'DMTest::S2' , 'StoreGateSvc+S2' ) required by Algorithm:
- * xAODTestReadSymlink
- o ( 'DMTest::S2' , 'StoreGateSvc+S2alias' ) required by Algorithm:
- * xAODTestReadSymlink
- o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo' ) required by Algorithm:
- * xAODTestReadSymlink
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::S1' , 'StoreGateSvc+S2' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadSymlink
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::S2' , 'StoreGateSvc+S2' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadSymlink
+AvalancheSchedulerSvc 0 INFO o ( 'DMTest::S2' , 'StoreGateSvc+S2alias' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadSymlink
+AvalancheSchedulerSvc 0 INFO o ( 'SG::AuxElement' , 'StoreGateSvc+cinfo' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * xAODTestReadSymlink
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
AvalancheSchedulerSvc 0 INFO Concurrency level information:
diff --git a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
index 78ac88046eeb1488d9d824ba41e91d35aa4d4d95..0ae40887c97864c0666f9e430cede61dd1240674 100644
--- a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file StoreGate/test/VarHandleKeyProperty_test.cxx
@@ -195,13 +195,13 @@ public:
{ return mgr.setPropertyRepr(n,r); }
virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const override
{ return mgr.getProperty (p); }
- virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name) const override
+ virtual const Gaudi::Details::PropertyBase& getProperty( std::string_view name) const override
{ return mgr.getProperty (name); }
- virtual StatusCode getProperty( const std::string& n, std::string& v ) const override
+ virtual StatusCode getProperty( std::string_view n, std::string& v ) const override
{ return mgr.getProperty (n, v); }
virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const override
{ return mgr.getProperties(); }
- virtual bool hasProperty(const std::string& name) const override
+ virtual bool hasProperty(std::string_view name) const override
{ return mgr.hasProperty(name); }
AnonymousPropertyHolder mgr;
diff --git a/Control/StoreGate/test/VarHandleProperty_test.cxx b/Control/StoreGate/test/VarHandleProperty_test.cxx
index 9746c2cd7109f0efcdc88e60d4c56c5c89af3421..8d49edf99e6f4acab2f0f3571e05ac7a38bccca7 100644
--- a/Control/StoreGate/test/VarHandleProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleProperty_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file StoreGate/test/VarHandleProperty_test.cxx
@@ -58,13 +58,13 @@ public:
{ return mgr.setPropertyRepr(n,r); }
virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const override
{ return mgr.getProperty (p); }
- virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name) const override
+ virtual const Gaudi::Details::PropertyBase& getProperty( std::string_view name) const override
{ return mgr.getProperty (name); }
- virtual StatusCode getProperty( const std::string& n, std::string& v ) const override
+ virtual StatusCode getProperty( std::string_view n, std::string& v ) const override
{ return mgr.getProperty (n, v); }
virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const override
{ return mgr.getProperties(); }
- virtual bool hasProperty(const std::string& name) const override
+ virtual bool hasProperty(std::string_view name) const override
{ return mgr.hasProperty(name); }
AnonymousPropertyHolder mgr;
diff --git a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
index e6c1b294f051217e89761c085bf56910cf5dab29..b3e11c01d20a3986beb8de12e506b41ba747a1b2 100644
--- a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package( Boost COMPONENTS filesystem thread system )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( tdaq COMPONENTS omniORB4 omnithread ipc is owl )
-find_package( tdaq-common COMPONENTS CTPfragment eformat eformat_write hltinterface )
+find_package( tdaq-common COMPONENTS CTPfragment eformat eformat_write hltinterface ers )
find_package( TBB )
# Component(s) in the package:
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx
index b103860baeb180f16d397521dbb8628d3b4e8c0a..69b472a661c3e574e9953f17f3ea7a8f3965fa6b 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigMessageSvc.h"
#include "GaudiKernel/IAppMgrUI.h"
@@ -421,12 +421,7 @@ void TrigMessageSvc::reportMessage(const Message& msg)
reportMessage(msg, outputLevel(msg.getSource()));
}
-void TrigMessageSvc::reportMessage(const char* source, int type, const char* message)
-{
- reportMessage(Message{source, type, message});
-}
-
-void TrigMessageSvc::reportMessage(const std::string& source, int type, const std::string& message)
+void TrigMessageSvc::reportMessage(std::string source, int type, std::string message)
{
reportMessage(Message{source, type, message});
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
index eea8a1f06a7a4b5c9ade510457872d0a30a024ee..fbf7db372b13d38d50761d6bd40cb1becf00cff2 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGSERVICES_TRIGMESSAGESVC_H
#define TRIGSERVICES_TRIGMESSAGESVC_H
@@ -68,9 +68,7 @@ public:
virtual void reportMessage(const Message& message) override;
virtual void reportMessage(const Message& msg, int outputLevel) override;
- virtual void reportMessage(const char* source, int type, const char* message) override;
- virtual void reportMessage(const std::string& source, int type,
- const std::string& message) override;
+ virtual void reportMessage(std::string source, int type, std::string message) override;
virtual std::ostream* defaultStream ATLAS_NOT_CONST_THREAD_SAFE() const override
{
return m_defaultStream;
@@ -91,8 +89,8 @@ public:
virtual std::string getLogColor(int) const override { return ""; }
///@{ Not supported by this implementation
- virtual void reportMessage(const StatusCode&, const std::string&) override { NOTSUPPORTED; }
- virtual void insertMessage(const StatusCode&, const Message&) override { NOTSUPPORTED; }
+ virtual void reportMessage(const StatusCode&, std::string_view) override { NOTSUPPORTED; }
+ virtual void insertMessage(const StatusCode&, Message) override { NOTSUPPORTED; }
virtual void eraseMessage() override { NOTSUPPORTED; }
virtual void eraseMessage(const StatusCode&) override { NOTSUPPORTED; }
virtual void eraseMessage(const StatusCode&, const Message&) override { NOTSUPPORTED; }
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
index 98fc6fb64fcbe761f6c1dd1d8ac2d250fc404e1b..680793adf0208c6ded3c0a1430cb9b331c0cc400 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "RootTruthParticleCnvTool.h"
@@ -206,13 +206,13 @@ StatusCode RootTruthParticleCnvTool::setProperty( const std::string&, const Gaud
StatusCode RootTruthParticleCnvTool::setPropertyRepr( const std::string&, const std::string& ){ abort(); }
StatusCode RootTruthParticleCnvTool::getProperty( Gaudi::Details::PropertyBase* ) const { abort(); }
const Gaudi::Details::PropertyBase&
-RootTruthParticleCnvTool::getProperty( const std::string& ) const{ abort(); }
-StatusCode RootTruthParticleCnvTool::getProperty( const std::string&,
+RootTruthParticleCnvTool::getProperty( std::string_view ) const{ abort(); }
+StatusCode RootTruthParticleCnvTool::getProperty( std::string_view,
std::string& ) const {
abort(); }
const std::vector< Gaudi::Details::PropertyBase* >&
RootTruthParticleCnvTool::getProperties() const { abort(); }
-bool RootTruthParticleCnvTool::hasProperty( const std::string& ) const {
+bool RootTruthParticleCnvTool::hasProperty( std::string_view ) const {
abort(); }
//
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
index 52f05145f10c0aa79b2aa284d36d294f5e9cb1c5..7e22505308c0202368acab1a99dc6fd58c0c93e4 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MCPARTICLEEVENTTPCNV_ROOTTRUTHPARTICLECNVTOOL_H
@@ -18,8 +18,8 @@ public:
/// @{
/// A hook for Athena algorithms
- virtual StatusCode execute() const;
- virtual StatusCode execute (const EventContext& ctx) const;
+ virtual StatusCode execute() const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/** Converts a @c McEventCollection into an @c TruthParticleContainer (ie:
* converts it into an AOD compliant collection).
@@ -44,49 +44,49 @@ public:
/// @name Function(s) inherited from IInterface
/// @{
virtual StatusCode queryInterface( const InterfaceID& riid,
- void** ppvInterface );
- virtual unsigned long addRef();
- virtual unsigned long release();
- virtual unsigned long refCount() const;
+ void** ppvInterface ) override;
+ virtual unsigned long addRef() override;
+ virtual unsigned long release() override;
+ virtual unsigned long refCount() const override;
/// @}
/// @name Function(s) inherited from IProperty
/// @{
- virtual StatusCode setProperty( const std::string& s );
- virtual StatusCode setProperty( const std::string& name, const Gaudi::Details::PropertyBase& p );
- virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r );
-
- virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const;
- virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name ) const;
- virtual StatusCode getProperty( const std::string& n, std::string& v ) const;
- virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const;
- virtual bool hasProperty(const std::string& name) const;
+ virtual StatusCode setProperty( const std::string& s ) override;
+ virtual StatusCode setProperty( const std::string& name, const Gaudi::Details::PropertyBase& p ) override;
+ virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r ) override;
+
+ virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const override;
+ virtual const Gaudi::Details::PropertyBase& getProperty( std::string_view name ) const override;
+ virtual StatusCode getProperty( std::string_view n, std::string& v ) const override;
+ virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const override;
+ virtual bool hasProperty(std::string_view name) const override;
/// @}
/// @name Function(s) inherited from IAlgTool
/// @{
- virtual const std::string& type() const;
- virtual const IInterface* parent() const;
- virtual StatusCode configure();
- virtual StatusCode initialize();
- virtual StatusCode sysInitialize();
- virtual StatusCode reinitialize();
- virtual StatusCode sysReinitialize();
- virtual StatusCode start();
- virtual StatusCode sysStart();
- virtual StatusCode restart();
- virtual StatusCode sysRestart();
- virtual StatusCode stop();
- virtual StatusCode sysStop();
- virtual StatusCode finalize();
- virtual StatusCode sysFinalize();
- virtual StatusCode terminate();
- virtual Gaudi::StateMachine::State FSMState() const;
+ virtual const std::string& type() const override;
+ virtual const IInterface* parent() const override;
+ virtual StatusCode configure() override;
+ virtual StatusCode initialize() override;
+ virtual StatusCode sysInitialize() override;
+ virtual StatusCode reinitialize() override;
+ virtual StatusCode sysReinitialize() override;
+ virtual StatusCode start() override;
+ virtual StatusCode sysStart() override;
+ virtual StatusCode restart() override;
+ virtual StatusCode sysRestart() override;
+ virtual StatusCode stop() override;
+ virtual StatusCode sysStop() override;
+ virtual StatusCode finalize() override;
+ virtual StatusCode sysFinalize() override;
+ virtual StatusCode terminate() override;
+ virtual Gaudi::StateMachine::State FSMState() const override;
/// @}
/// @name Function(s) inherited from INamedInterface
/// @{
- virtual const std::string& name() const;
+ virtual const std::string& name() const override;
/// @}
};
diff --git a/Projects/AthAnalysis/build_externals.sh b/Projects/AthAnalysis/build_externals.sh
index 1e41d1109c4de547f84a73fd060cf323cd282eae..8ea554be98cce26a8e13f5ac81efefde8c7d2d46 100755
--- a/Projects/AthAnalysis/build_externals.sh
+++ b/Projects/AthAnalysis/build_externals.sh
@@ -11,7 +11,7 @@ ATLAS_EXT_PROJECT_NAME="AthAnalysisExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=100
-DLCG_VERSION_POSTFIX="_ATLAS_4"
- -DATLAS_GAUDI_TAG="v35r1.000")
+ -DATLAS_GAUDI_TAG="v36r0.000")
ATLAS_EXTRA_MAKE_ARGS=()
# Let "the common script" do all the heavy lifting.
diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh
index 599fae78e0c691b235fe5389b377d8a7c8637cc2..9b7f772820d33ea5618afac3d30b3de88968eb29 100755
--- a/Projects/AthGeneration/build_externals.sh
+++ b/Projects/AthGeneration/build_externals.sh
@@ -11,7 +11,7 @@ ATLAS_EXT_PROJECT_NAME="AthGenerationExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=100
-DLCG_VERSION_POSTFIX="_ATLAS_3"
- -DATLAS_GAUDI_TAG="v35r1.000")
+ -DATLAS_GAUDI_TAG="v36r0.000")
ATLAS_EXTRA_MAKE_ARGS=()
# Let "the common script" do all the heavy lifting.
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index b136632d0ea1b16383691c4da92611c90ea7ff04..7cdafb231fae9077e5cbe4fdd28c1ed316163676 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -11,7 +11,7 @@ ATLAS_EXT_PROJECT_NAME="AthSimulationExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=100
-DLCG_VERSION_POSTFIX="_ATLAS_4"
- -DATLAS_GAUDI_TAG="v35r1.000")
+ -DATLAS_GAUDI_TAG="v36r0.000")
ATLAS_EXTRA_MAKE_ARGS=()
# Let "the common script" do all the heavy lifting.
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index 4fe89ecc3586fef7708a1454b2a4d585175dc4be..c6fd519085ac0e0318892caeb5800dae5f25fb65 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -11,7 +11,7 @@ ATLAS_EXT_PROJECT_NAME="AthenaExternals"
ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=100
-DLCG_VERSION_POSTFIX="_ATLAS_4"
- -DATLAS_GAUDI_TAG="v35r1.000")
+ -DATLAS_GAUDI_TAG="v36r0.000")
ATLAS_EXTRA_MAKE_ARGS=()
# Let "the common script" do all the heavy lifting.
diff --git a/Reconstruction/MissingETGoodness/src/JetVarTool.cxx b/Reconstruction/MissingETGoodness/src/JetVarTool.cxx
index f6a11f5e802a2d29b6e560f8b8095f0cd0e12d6b..386b2b6af75b133a84321a01fda69b5a7a387563 100644
--- a/Reconstruction/MissingETGoodness/src/JetVarTool.cxx
+++ b/Reconstruction/MissingETGoodness/src/JetVarTool.cxx
@@ -9,7 +9,6 @@
#include "CaloEvent/CaloClusterContainer.h"
#include "CaloEvent/CaloSamplingHelper.h"
#include "TileEvent/TileCell.h"
-#include "AthenaKernel/tools/AthenaPackageInfo.h"
namespace {
@@ -107,9 +106,7 @@ StatusCode JetVarTool::initialize() {
IClassIDSvc* clidsvc = 0;
ATH_CHECK( service("ClassIDSvc", clidsvc) );
if (!clidsvc->isIDInUse (1118613496)) {
- ATH_CHECK( clidsvc->setTypePackageForID (1118613496,
- "ParticleJetContainer",
- Athena::PackageInfo("dummy-00-00-00")) );
+ ATH_CHECK( clidsvc->setTypeForID (1118613496, "ParticleJetContainer") );
}
return StatusCode::SUCCESS;
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
index eb8acb8890f262537413340ff579c78b467e453a..fa0edcce61a28113c27fb057224c0a309df6b2ea 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
@@ -350,8 +350,8 @@ ThreadPoolSvc 0 INFO no thread
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
AvalancheSchedulerSvc 0 INFO Found 14 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'TileBeamElemContainer' , 'StoreGateSvc+TileBeamElemCnt' ) required by Algorithm:
- * TileBeamElemCntDumper
+AvalancheSchedulerSvc 0 INFO o ( 'TileBeamElemContainer' , 'StoreGateSvc+TileBeamElemCnt' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * TileBeamElemCntDumper
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceRulesGraph 0 INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
index 6ed6b5813b070a6ada3936ce4a4b816363ee6dbc..10f8efaa197dfb091729f2f95a7e96aa64233af5 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
@@ -350,10 +350,10 @@ ThreadPoolSvc 0 INFO no thread
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
AvalancheSchedulerSvc 0 INFO Found 15 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'TileDigitsContainer' , 'StoreGateSvc+MuRcvDigitsCnt' ) required by Algorithm:
- * MuRcvDigitsCntDumper
- o ( 'TileDigitsContainer' , 'StoreGateSvc+TileDigitsCnt' ) required by Algorithm:
- * TileDigitsCntDumper
+AvalancheSchedulerSvc 0 INFO o ( 'TileDigitsContainer' , 'StoreGateSvc+MuRcvDigitsCnt' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * MuRcvDigitsCntDumper
+AvalancheSchedulerSvc 0 INFO o ( 'TileDigitsContainer' , 'StoreGateSvc+TileDigitsCnt' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * TileDigitsCntDumper
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceRulesGraph 0 INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
index 187d7b7878217057a4312025723aa27a26758bc9..68fbf36bbb51d01e07364486256012f578e8d885 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
@@ -350,8 +350,8 @@ ThreadPoolSvc 0 INFO no thread
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
AvalancheSchedulerSvc 0 INFO Found 14 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'TileL2Container' , 'StoreGateSvc+TileL2Cnt' ) required by Algorithm:
- * TileL2CntDumper
+AvalancheSchedulerSvc 0 INFO o ( 'TileL2Container' , 'StoreGateSvc+TileL2Cnt' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * TileL2CntDumper
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceRulesGraph 0 INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
index 1bfa584dca66047cb6b181136bcafd65ce4f5e61..c68aa9940f023c9d2ddcb5a8152dad4e82282cd6 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
@@ -350,8 +350,8 @@ ThreadPoolSvc 0 INFO no thread
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
AvalancheSchedulerSvc 0 INFO Found 14 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'TileLaserObject' , 'StoreGateSvc+TileLaserObj' ) required by Algorithm:
- * TileLaserObjectDumper
+AvalancheSchedulerSvc 0 INFO o ( 'TileLaserObject' , 'StoreGateSvc+TileLaserObj' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * TileLaserObjectDumper
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceRulesGraph 0 INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
index e9ac79ee0475faf7823ba5eb2480e65d40685a26..1b043239df524783df5c3acf6751413d22d1c229 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
@@ -350,8 +350,8 @@ ThreadPoolSvc 0 INFO no thread
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
AvalancheSchedulerSvc 0 INFO Found 14 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'TileMuonReceiverContainer' , 'StoreGateSvc+TileMuRcvCnt' ) required by Algorithm:
- * TileMuonReceiverDumper
+AvalancheSchedulerSvc 0 INFO o ( 'TileMuonReceiverContainer' , 'StoreGateSvc+TileMuRcvCnt' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * TileMuonReceiverDumper
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceRulesGraph 0 INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
index b48821344e56bd9a004f14c939c457800671d6cc..d187596664da8af83b487c1612c9de7a9cf107ee 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
@@ -350,10 +350,10 @@ ThreadPoolSvc 0 INFO no thread
AvalancheSchedulerSvc 0 INFO Activating scheduler in a separate thread
AvalancheSchedulerSvc 0 INFO Found 15 algorithms
AvalancheSchedulerSvc 0 INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
- o ( 'TileRawChannelContainer' , 'StoreGateSvc+MuRcvRawChCnt' ) required by Algorithm:
- * MuRcvRawChannelCntDumper
- o ( 'TileRawChannelContainer' , 'StoreGateSvc+TileRawChannelCnt' ) required by Algorithm:
- * TileRawChannelCntDumper
+AvalancheSchedulerSvc 0 INFO o ( 'TileRawChannelContainer' , 'StoreGateSvc+MuRcvRawChCnt' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * MuRcvRawChannelCntDumper
+AvalancheSchedulerSvc 0 INFO o ( 'TileRawChannelContainer' , 'StoreGateSvc+TileRawChannelCnt' ) required by Algorithm:
+AvalancheSchedulerSvc 0 INFO * TileRawChannelCntDumper
PrecedenceSvc 0 INFO Assembling CF and DF task precedence rules
PrecedenceRulesGraph 0 INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
PrecedenceSvc 0 INFO PrecedenceSvc initialized successfully
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
index d68340395b894ffd46b377ecf940ec90b927c0ca..a1e79d8284c4615d516c24b30f7c3c681f5eb45e 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include <boost/algorithm/string.hpp>
@@ -16,7 +16,6 @@
TrigConf::JobOptionsSvc::JobOptionsSvc(const std::string& name, ISvcLocator* pSvcLocator) :
base_class(name, pSvcLocator),
- m_josvc("JobOptionsSvc/TrigConfWrapped_JobOptionsSvc", name),
m_optsvc("JobOptionsSvc/TrigConfWrapped_JobOptionsSvc", name)
{}
@@ -25,13 +24,8 @@ StatusCode TrigConf::JobOptionsSvc::initialize()
ATH_MSG_INFO("Initializing TrigConf::JobOptionsSvc");
// Configure the wrapped JobOptionsSvc
- ATH_CHECK(m_josvc.retrieve());
- SmartIF<IProperty> joprop = &*m_josvc;
- ATH_CHECK(joprop->setProperty("TYPE", "NONE"));
-
ATH_CHECK(m_optsvc.retrieve());
- SmartIF<IService> josvc = &*m_josvc;
- m_optsvc->set( josvc->name() + ".TYPE" , "NONE" );
+ m_optsvc->set( m_optsvc.name() + ".TYPE", "NONE" );
if (m_sourceType == "FILE") {
ATH_MSG_INFO("Reading joboptions from " << m_sourcePath.value());
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
index 651d618b9110cc01d2e81d0f4c395ac7b294fbcc..8d972d6224cbfc42badb830f35bc46eec4190f10 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
@@ -8,12 +8,6 @@
#include <string>
#include <vector>
-// We have to include the deprecated IJobOptionsSvc header. Silence the warning.
-// This can be removed in Gaudi v36 together with the IJobOptionsSvc removal:
-#define GAUDI_INTERNAL_NO_IJOBOPTIONSSVC_H_DEPRECATION 1
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#include "GaudiKernel/IJobOptionsSvc.h"
-
#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -36,7 +30,7 @@ namespace TrigConf {
* - `DB`: Read properties from DB, connection string in `PATH`, see \ref parseDBString
*
*/
- class JobOptionsSvc : public extends<AthService, TrigConf::IJobOptionsSvc, ::IJobOptionsSvc, Gaudi::Interfaces::IOptionsSvc> {
+ class JobOptionsSvc : public extends<AthService, TrigConf::IJobOptionsSvc, Gaudi::Interfaces::IOptionsSvc> {
using AthService::getProperties;
public:
@@ -88,44 +82,10 @@ namespace TrigConf {
{
return m_optsvc->broadcast(filter, value, defaults);
}
- ///@}
-
- /// @name IJobOptionsSvc interface
- /// Most interfaces are just forwards to the "real" JobOptionsSvc.
- ///@{
- virtual StatusCode setMyProperties(const std::string& client, IProperty* me) override
- {
- return m_josvc->setMyProperties(client, me);
- }
-
- virtual StatusCode addPropertyToCatalogue(const std::string& client,
- const Gaudi::Details::PropertyBase& property) override
- {
- return m_josvc->addPropertyToCatalogue(client, property);
- }
-
- virtual StatusCode removePropertyFromCatalogue(const std::string& client,
- const std::string& name) override
- {
- return m_josvc->removePropertyFromCatalogue(client, name);
- }
-
- virtual const std::vector<const Gaudi::Details::PropertyBase*>*
- getProperties(const std::string& client) const override
- {
- return m_josvc->getProperties(client);
- }
-
- virtual const Gaudi::Details::PropertyBase* getClientProperty(const std::string& client,
- const std::string& name) const override
- {
- return m_josvc->getClientProperty(client, name);
- }
- virtual std::vector<std::string> getClients() const override { return m_josvc->getClients(); }
- virtual StatusCode readOptions(const std::string&, const std::string&) override
+ virtual StatusCode readOptions(std::string_view, std::string_view) override
{
- throw std::runtime_error("TrigConf::JobOptionsSvc::readOptions() is deprecated");
+ throw std::runtime_error("TrigConf::JobOptionsSvc::readOptions() is not supported");
}
///@}
@@ -155,7 +115,6 @@ namespace TrigConf {
Gaudi::Property<std::string> m_dump{this, "DUMPFILE", {}, "Dump job properties into JSON file"};
/// handle to the "real" IOptionsSvc
- ServiceHandle<::IJobOptionsSvc> m_josvc;
ServiceHandle<Gaudi::Interfaces::IOptionsSvc> m_optsvc;
};