diff --git a/Control/AthenaExamples/AthExHive/src/loopTest/HiveAlgL1.cxx b/Control/AthenaExamples/AthExHive/src/loopTest/HiveAlgL1.cxx
index 922f6d8f5d3244447f6e989d756f972069c15ca2..0599d3965aca33a4a6d435464e5d66d32aa01515 100644
--- a/Control/AthenaExamples/AthExHive/src/loopTest/HiveAlgL1.cxx
+++ b/Control/AthenaExamples/AthExHive/src/loopTest/HiveAlgL1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "HiveAlgL1.h"
@@ -18,10 +18,6 @@ HiveAlgL1::~HiveAlgL1() {}
StatusCode HiveAlgL1::initialize() {
ATH_MSG_DEBUG("initialize " << name());
- // setProperties();
-
- // ATH_MSG_INFO("time: " << sleep() );
-
ATH_CHECK( m_rdh1.initialize() );
ATH_CHECK( m_wrh1.initialize() );
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.cxx b/Control/AthenaServices/src/LoggedMessageSvc.cxx
index 3e2c884f502628548f9585f6c5f17756dffc7a0d..c594411e119b87eab1b7d96e74251261ceb19177 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.cxx
+++ b/Control/AthenaServices/src/LoggedMessageSvc.cxx
@@ -1,8 +1,7 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: AthMessageSvc.cpp,v 1.27 2008/10/21 16:25:55 marcocle Exp $
#include "GaudiKernel/Kernel.h"
#include "GaudiKernel/StatusCode.h"
@@ -124,10 +123,6 @@ StatusCode LoggedMessageSvc::initialize() {
SmartIF<IMessageSvc> &si = const_cast<SmartIF<IMessageSvc>&> (msgSvc());
si.reset();
- // Set my own properties
- sc = setProperties();
- if (sc.isFailure()) return sc;
-
#ifdef _WIN32
m_color = false;
#endif
diff --git a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
index 73c04aa2a0a5a9bacef2f0880f2b873ef9bee47c..d8104ae892a43b0b3b66a17a4379770ae09882ad 100644
--- a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
+++ b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -122,20 +122,6 @@ PileUpEventLoopMgr::~PileUpEventLoopMgr() {}
//=========================================================================
StatusCode PileUpEventLoopMgr::initialize()
{
- //-------------------------------------------------------------------------
- // Process Properties
- //-------------------------------------------------------------------------
- try
- {
- CHECK(setProperties());
- // configure our MsgStream
- m_msg.get().setLevel( m_outputLevel.value() );
- }
- catch (...)
- {
- ATH_MSG_WARNING ( "Caught exception thrown reading in properties" );
- }
-
ATH_MSG_INFO ( "Initializing " << this->name() << " - package version " << PACKAGE_VERSION ) ;
if(!m_allowSerialAndMPToDiffer)
{
diff --git a/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx b/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
index 4d3245aedbb349fb973f239891b325195767ca52..1f320b61862006144565a56398d3ed72eedb5d06 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
+++ b/Generators/McAsciiEventSelector/src/McAsciiCnvSvc.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// McAsciiCnvSvc.cxx
@@ -60,7 +60,6 @@ StatusCode McAsciiCnvSvc::initialize()
<< endmsg;
return StatusCode::FAILURE;
}
- setProperties().ignore();
// retrieve tool
setupCnvTool();
diff --git a/Generators/McAsciiEventSelector/src/McAsciiEventSelector.cxx b/Generators/McAsciiEventSelector/src/McAsciiEventSelector.cxx
index 58c7a5f46c8b2851547dc7c59e2abd426a23a21c..40882516b535d53c35bcf2369e758607dd1411c8 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiEventSelector.cxx
+++ b/Generators/McAsciiEventSelector/src/McAsciiEventSelector.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// McAsciiEventSelector.cxx
@@ -84,9 +84,6 @@ StatusCode McAsciiEventSelector::initialize()
{
ATH_MSG_INFO( "Enter McAsciiEventSelector initialization..." );
- ATH_CHECK( AthService::initialize() );
- setProperties().ignore();
-
const std::size_t nbrAsciiFiles = m_asciiFileNames.value().size();
if ( nbrAsciiFiles <= 0 ) {
ATH_MSG_ERROR( "You need to give at least 1 input file !!"
diff --git a/Generators/McEventSelector/McEventSelector/McEventSelector.h b/Generators/McEventSelector/McEventSelector/McEventSelector.h
index 3bd969807e33b874e32a7ed94eea7e6f3670a473..542d4397aed9df65acc16ca5a10bf497e0af0e3c 100644
--- a/Generators/McEventSelector/McEventSelector/McEventSelector.h
+++ b/Generators/McEventSelector/McEventSelector/McEventSelector.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//====================================================================
@@ -26,7 +26,6 @@
#include "GaudiKernel/IEvtSelector.h"
#include "AthenaBaseComps/AthService.h"
#include "Gaudi/Property.h" /*no forward decl: typedef*/
-#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
@@ -35,12 +34,6 @@ class EventSource;
class ISvcLocator;
class McContext;
-#ifdef WIN32
-// Disable warning C4786: identifier was truncated to '255' characters in the debug information
-#pragma warning ( disable : 4786 )
-#endif
-
-
//--------------------------------------------------------------------
// Event Selector
//--------------------------------------------------------------------
@@ -52,8 +45,7 @@ public:
virtual StatusCode initialize() override;
virtual StatusCode stop() override;
- virtual StatusCode finalize() override;
- virtual StatusCode queryInterface(const InterfaceID& riid,
+ virtual StatusCode queryInterface(const InterfaceID& riid,
void** ppvInterface) override;
virtual StatusCode createContext(Context*& refpCtxt) const override;
diff --git a/Generators/McEventSelector/src/McEventSelector.cxx b/Generators/McEventSelector/src/McEventSelector.cxx
index 7c27696c5140b2185c0e0a97db666429408b4642..d158fea79c208745ec7a8e75b6426cf6db0a7fce 100644
--- a/Generators/McEventSelector/src/McEventSelector.cxx
+++ b/Generators/McEventSelector/src/McEventSelector.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//====================================================================
@@ -272,18 +272,7 @@ McEventSelector::createContext(Context*& refpCtxt) const
StatusCode McEventSelector::initialize() {
ATH_MSG_INFO (" Enter McEventSelector Initialization ");
- StatusCode sc = AthService::initialize();
- msg().setLevel( m_outputLevel.value() );
- if( sc.isSuccess() ) {
- setProperties().ignore();
- } else {
- ATH_MSG_ERROR ("Unable to initialize service ");
- return sc;
- }
-
- ATH_MSG_DEBUG (" McEventSelector Initialized Properly ... ");
-
- return sc;
+ return StatusCode::SUCCESS;
}
StatusCode McEventSelector::stop() {
@@ -301,11 +290,6 @@ StatusCode McEventSelector::stop() {
return StatusCode::SUCCESS;
}
-StatusCode McEventSelector::finalize() {
- ATH_MSG_INFO ("finalize");
-
- return StatusCode::SUCCESS;
-}
// IEvtSelector::next
StatusCode
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
index 5a31f5d9d9b40acba815feec38330249d65fd19e..d11364eb6e9ec706783346f11033a35ab65d2f01 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/PixelConditionsSummaryTool.cxx
@@ -22,8 +22,6 @@ PixelConditionsSummaryTool::~PixelConditionsSummaryTool(){}
StatusCode PixelConditionsSummaryTool::initialize(){
ATH_MSG_DEBUG("PixelConditionsSummaryTool::initialize()");
- ATH_CHECK(setProperties());
-
ATH_CHECK(m_condDCSStateKey.initialize());
ATH_CHECK(m_condDCSStatusKey.initialize());
ATH_CHECK(m_BSErrContReadKey.initialize(SG::AllowEmpty));
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RadDamageSummaryTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RadDamageSummaryTool.cxx
index 146f84f61b6d2af50ebeddc07d4374800650ee7f..d83aff93106f74d5dfdd1b59ad45fdbc4ef98379 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RadDamageSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RadDamageSummaryTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "SCT_RadDamageSummaryTool.h"
@@ -16,8 +16,6 @@ SCT_RadDamageSummaryTool::SCT_RadDamageSummaryTool(const std::string& type, cons
StatusCode SCT_RadDamageSummaryTool::initialize() {
ATH_MSG_INFO("Initializing SCT_RadDamageSummaryTool");
- ATH_CHECK(setProperties());
-
ATH_CHECK(m_chargeTrappingTool.retrieve());
ATH_MSG_INFO("SCT_ChargeTrappingTool retrieved");
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx
index f511586c108edcdab3e9fd47672bc7984057e79f..220fcd0ddcedcb9a4a91f677c5699f8587a8fd23 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx
@@ -41,7 +41,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new BCMOverlay{"BCMOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx
index c21fc8ccf6d26962e81d417dd92fd20254017d2c..bd3798b27b2e565229eba2b53cb3eab4c43a00bf 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx
@@ -39,7 +39,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new PixelOverlay{"PixelOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlay_test.cxx
index 94afde1679897247a79dd30a666dc21df6640e3a..e29cc852e1bc3c99978f4639445a2db9439901ff 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlay_test.cxx
@@ -44,7 +44,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new SCTOverlay{"SCTOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
StoreGateSvc *detStore(nullptr);
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
index f7cce7f0dd1103fdd9d785f7b1e666dbea6ef2bf..a21c8c8b41dba29cacd77d04364fcb153c599b92 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
@@ -204,7 +204,6 @@ namespace OverlayTesting {
// the tested Algorithm
m_alg = new TRTOverlay{"TRTOverlay", m_svcLoc};
m_alg->addRef();
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
// ordering B, A, C, D is on purpose to test for unintended alphabetic ordering
std::string inputSigPropertyValue = "'StoreGateSvc+TRT_RDOs_SIG'";
std::string inputBkgPropertyValue = "'StoreGateSvc+TRT_RDOs_BKG'";
@@ -234,7 +233,6 @@ namespace OverlayTesting {
if(!service) {
return nullptr;
}
- EXPECT_TRUE( service->setProperties().isSuccess() );
EXPECT_TRUE( service->configure().isSuccess() );
EXPECT_TRUE( m_svcMgr->addService(service).isSuccess() );
// assert that finalize() gets called once per test case
@@ -257,7 +255,6 @@ namespace OverlayTesting {
return nullptr;
}
- EXPECT_TRUE( tool->setProperties().isSuccess() );
EXPECT_TRUE( tool->configure().isSuccess() );
// assert that finalize() gets called once per test case
diff --git a/MuonSpectrometer/MuonOverlay/MdtOverlay/test/MdtOverlay_test.cxx b/MuonSpectrometer/MuonOverlay/MdtOverlay/test/MdtOverlay_test.cxx
index fac3c4f6df54d6b3a62c9532be39b5ccef625db9..86fa1eea11a5a03784a559c9933a872f2bd1ff63 100644
--- a/MuonSpectrometer/MuonOverlay/MdtOverlay/test/MdtOverlay_test.cxx
+++ b/MuonSpectrometer/MuonOverlay/MdtOverlay/test/MdtOverlay_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,7 +36,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new MdtOverlay{"MdtOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/MuonSpectrometer/MuonOverlay/RpcOverlay/test/RpcOverlay_test.cxx b/MuonSpectrometer/MuonOverlay/RpcOverlay/test/RpcOverlay_test.cxx
index cb19ccfa6a248eeaf2f0de17d0f51e396e8d54bd..0f465f8402405a6c1173e355ad425c142252be37 100644
--- a/MuonSpectrometer/MuonOverlay/RpcOverlay/test/RpcOverlay_test.cxx
+++ b/MuonSpectrometer/MuonOverlay/RpcOverlay/test/RpcOverlay_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,7 +36,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new RpcOverlay{"RpcOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/MuonSpectrometer/MuonOverlay/TgcOverlay/test/TgcOverlay_test.cxx b/MuonSpectrometer/MuonOverlay/TgcOverlay/test/TgcOverlay_test.cxx
index e168fe74fa149151e90143494f678ef37c056ac7..592d7ee07676df1561887103b16142dc5dc47ac0 100644
--- a/MuonSpectrometer/MuonOverlay/TgcOverlay/test/TgcOverlay_test.cxx
+++ b/MuonSpectrometer/MuonOverlay/TgcOverlay/test/TgcOverlay_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,7 +36,6 @@ namespace OverlayTesting {
protected:
virtual void SetUp() override {
m_alg = new TgcOverlay{"TgcOverlay", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
index 585b8271c772c6ece9dcace9e74a99e086b6e294..bfef73785373ead2d5ad8092b744392c6f7eebbc 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
@@ -590,18 +590,10 @@ StatusCode AANTupleStream::initialize_subAlgos()
ATH_MSG_INFO (" -> creating sub-algorithm " << (*it));
sc = createSubAlgorithm( theType,theName, algo );
if (sc.isFailure())
- {
- ATH_MSG_FATAL (" ERROR creating sub-alg." << (*it));
- return StatusCode::FAILURE;
- }
-
- // force subAlgorithm to set his properties now (reading the jobOptions
- sc = algo->setProperties();
- if (sc.isFailure())
- {
- ATH_MSG_FATAL (" ERROR setting properties for this sub-algorithm.");
- return StatusCode::FAILURE;
- }
+ {
+ ATH_MSG_FATAL (" ERROR creating sub-alg." << (*it));
+ return StatusCode::FAILURE;
+ }
}
return sc;
diff --git a/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx b/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
index 4a7ac7cb8306a1e7eaa59e694a2c936ca99be7a1..bdb8d282cd049346d5dcf8b7efad246bd458e27e 100644
--- a/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
+++ b/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
@@ -51,7 +51,6 @@ namespace SimTesting {
protected:
virtual void SetUp() override {
m_alg = new Simulation::BeamEffectsAlg{"BeamEffectsAlg", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
index 7fac942845dd71d4a412af3dd78c9a96dd21e040..fd4559f57b4cae43f77538200fcdb060d8469f91 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/CollectionMerger_test.cxx
@@ -56,7 +56,6 @@ class CollectionMerger_test : public ::testing::Test {
protected:
virtual void SetUp() override {
m_alg = new ISF::CollectionMerger{"CollectionMerger", g_svcLoc};
- ASSERT_TRUE( m_alg->setProperties().isSuccess() );
ASSERT_TRUE( g_svcLoc->service("StoreGateSvc", m_sg) );
}
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
index bb5bf49a7643574cf7dbaef9276c920b4c93c970..32cf0185a8ca147ca43a5898c279cf79a3c9a5d8 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
@@ -310,7 +310,6 @@ protected:
if(!service) {
return nullptr;
}
- EXPECT_TRUE( service->setProperties().isSuccess() );
EXPECT_TRUE( service->configure().isSuccess() );
EXPECT_TRUE( m_svcMgr->addService(service).isSuccess() );
// assert that finalize() gets called once per test case
@@ -333,7 +332,6 @@ protected:
return nullptr;
}
- EXPECT_TRUE( tool->setProperties().isSuccess() );
EXPECT_TRUE( tool->configure().isSuccess() );
// assert that finalize() gets called once per test case
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
index a5323da69977a4e5773baaae2d83c2b6df30878f..b108828792f95f0c48ad1ecbe95ac43490227dd4 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
@@ -102,7 +102,6 @@ class InputConverter_test: public ::testing::Test {
SmartIF<IService>& serviceSmartPointer = m_svcLoc->service("ISF::InputConverter/InputConverter");
m_svc = dynamic_cast<ISF::InputConverter*>(serviceSmartPointer.get());
EXPECT_NE(nullptr, m_svc);
- ASSERT_TRUE( m_svc->setProperties().isSuccess() );
ASSERT_TRUE( m_svc->configure().isSuccess() );
}
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
index f3d593c8f8dfd7b1d935265dd8db399ef5d8b76c..dad163f26f65d4b4c5d9928399f7abb3d51b2de8 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
@@ -189,7 +189,6 @@ namespace ISFTesting {
m_svc = dynamic_cast<ISF::TruthSvc*>(svc.get());
ASSERT_NE(nullptr, m_svc);
- ASSERT_TRUE( m_svc->setProperties().isSuccess() );
ASSERT_TRUE( m_svc->configure().isSuccess() );
}
diff --git a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigMonitorToolBase.cxx b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigMonitorToolBase.cxx
index 3f754311f8745882d66b57eb3598e2f7ed37f07f..3dc11664e00a6c140ec545591c0ac7718268c32a 100755
--- a/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigMonitorToolBase.cxx
+++ b/Trigger/TrigMonitoring/TrigMonitorBase/src/TrigMonitorToolBase.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ********************************************************************
@@ -37,7 +37,6 @@ TrigMonitorToolBase::~TrigMonitorToolBase()
StatusCode TrigMonitorToolBase::initialize() {
- ATH_CHECK( setProperties() );
ATH_CHECK( m_histSvc.retrieve() );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
index c4712cfe0bc645cb54b714887ca0a648742122f3..3d71d15030985a80074f141d7c8fc890d9da7e3f 100644
--- a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
@@ -995,13 +995,11 @@ HLT::Algo* TrigSteer::getAlgo(const std::string& name)
if ( dynamic_cast<HLT::HypoAlgo*>(algo) ) {
BooleanProperty enabled("Enable", m_doHypo);
algo->setProperty(enabled).ignore();
- algo->setProperties().ignore();
ATH_MSG_DEBUG(( m_doHypo ? "enabling " : "disabling ") << subAlg_name << " because it is Hypo");
}
if ( dynamic_cast<HLT::TECreateAlgo*>(algo) ) {
BooleanProperty enabled("Enable", m_doFex);
algo->setProperty(enabled).ignore();
- algo->setProperties().ignore();
ATH_MSG_DEBUG((m_doFex ? "enabling " : "disabling ") << subAlg_name << " because it is Fex");
}
diff --git a/Trigger/TrigTools/TrigTimeAlgs/src/TrigTimerSvc.cxx b/Trigger/TrigTools/TrigTimeAlgs/src/TrigTimerSvc.cxx
index 7dde3d2c52ce5d078fb1ce10c18e601bb7dd99c1..8c637d224744d9ce31fdf7d291b8f610ff118550 100755
--- a/Trigger/TrigTools/TrigTimeAlgs/src/TrigTimerSvc.cxx
+++ b/Trigger/TrigTools/TrigTimeAlgs/src/TrigTimerSvc.cxx
@@ -1,10 +1,9 @@
// this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: TrigTimerSvc.cxx,v 1.12 2009-04-15 14:00:22 tbold Exp $
#include "TrigTimeAlgs/TrigTimerSvc.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -48,8 +47,6 @@ StatusCode TrigTimerSvc::queryInterface (const InterfaceID& riid, void** ppvInte
StatusCode TrigTimerSvc::initialize ( ) {
- ATH_CHECK( setProperties() );
-
// compile regexes
m_includeRegex = boost::regex(m_includeName);
m_excludeRegex = boost::regex(m_excludeName);