From 82a79bd9b8c2016ab07aeda1c004ee0b22cb3164 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Thu, 19 May 2022 09:33:46 +0200 Subject: [PATCH] Remove getMessageSvc uses in AthMessaging constructor Passing the `MessageSvc` pointer is no longer necessary for `AthMessaging`. --- .../CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx | 2 +- Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx | 3 +-- Control/AthViews/src/DebugView.cxx | 3 +-- Control/AthenaServices/src/AthenaEventLoopMgr.cxx | 3 +-- Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx | 3 +-- Control/PileUpComps/src/PileUpEventLoopMgr.cxx | 3 +-- Control/PileUpTools/src/PileUpStream.cxx | 9 ++++----- Database/IOVDbSvc/src/IOVDbFolder.cxx | 3 +-- Database/RDBAccessSvc/src/SqliteRecordset.cxx | 3 +-- .../ReadoutGeometryBase/src/SiCommonItems.cxx | 3 +-- .../ALFA_LocRec/src/ALFA_CenterGravity.cxx | 3 +-- .../ALFA_LocRec/src/ALFA_EdgeMethod.cxx | 3 +-- .../ALFA_LocRec/src/ALFA_HalfReco.cxx | 3 +-- .../ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDGap.cxx | 3 +-- .../ALFA_LocRec/src/ALFA_MDMultiple.cxx | 5 ++--- .../ALFA_LocRec/src/ALFA_MDOverlap.cxx | 3 +-- .../ALFA_LocRec/src/ALFA_MDTracking.cxx | 3 +-- .../ALFA_LocRec/src/ALFA_ODTracking.cxx | 3 +-- .../src/LUCID_DigitByteStreamCnv.cxx | 3 +-- ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx | 3 +-- ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx | 3 +-- .../HGTD_GeoModelXml/src/HGTD_GmxInterface.cxx | 3 +-- .../HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx | 2 +- .../BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx | 3 +-- .../InDetGeoModelUtils/src/InDetDDAthenaComps.cxx | 3 +-- .../InDetGeoModelUtils/src/InDetMaterialManager.cxx | 9 ++++----- .../InDetGeoModelUtils/src/VolumeBuilder.cxx | 7 +++---- .../InDetReadoutGeometry/src/InDetDetectorManager.cxx | 3 +-- .../InDetServMatGeoModel/src/EndPlateFactoryFS.cxx | 3 +-- .../InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx | 3 +-- .../InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx | 2 +- .../InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx | 3 +-- .../InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx | 3 +-- .../InDetDetDescr/InDetServMatGeoModel/src/Routing2.cxx | 3 +-- .../InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx | 3 +-- .../InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx | 3 +-- .../InDetServMatGeoModel/src/ServicesTracker.cxx | 3 +-- .../InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx | 3 +-- .../InDetServMatGeoModel/src/SupportRailFactoryFS.cxx | 3 +-- .../InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx | 3 +-- .../InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx | 3 +-- .../PixelGeoModel/src/PixelDetectorDC1DC2.cxx | 3 +-- .../PixelGeoModelXml/src/PixelGmxInterface.cxx | 2 +- .../StripGeoModelXml/src/StripGmxInterface.cxx | 2 +- .../src/TRT_ElectronPidTool_ToTcalculation.cxx | 3 +-- .../TRT_PAI_Process/src/TRT_PAI_effectiveGas.cxx | 3 +-- .../TRT_PAI_Process/src/TRT_PAI_gasMixture.cxx | 3 +-- .../TRT_TR_Process/src/TRRegionXMLHandler.cxx | 3 +-- .../TRT_TR_Process/src/TRTTransitionRadiation.cxx | 3 +-- .../InDetPhysValMonitoring/src/InDetPlotBase.cxx | 3 +-- .../InDetPhysValMonitoring/src/ResolutionHelper.cxx | 3 +-- LArCalorimeter/LArCOOLConditions/src/LArCondFlatBase.cxx | 3 +-- .../LArCOOLConditions/src/LArCondSuperCellBase.cxx | 3 +-- LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx | 3 +-- .../LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx | 2 +- .../LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx | 2 +- .../MuonCnv/MuonTGC_CnvTools/src/TgcSlbDataHelper.cxx | 3 +-- .../MM_Digitization/src/MM_StripsResponseSimulation.cxx | 3 +-- .../TGC_Digitization/src/TgcDigitMaker.cxx | 2 +- .../sTGC_Digitization/sTGC_Digitization/sTgcVMMSim.h | 3 +-- .../sTGC_Digitization/src/sTgcDigitMaker.cxx | 2 +- .../MuonValidation/MuonPRDTest/Root/PrdTesterModule.cxx | 3 +-- .../MuonValidation/MuonPRDTest/src/ValAlgVariables.h | 3 +-- .../AnalysisUtils/src/ParticleCandidateList.cxx | 5 ++--- .../JetTagDQA/src/BTaggingValidationPlots.cxx | 3 +-- .../TrackCaloClusterRecValidation/src/TCCPlotsBase.cxx | 3 +-- .../G4Atlas/G4AtlasAlg/src/G4AtlasMTRunManager.cxx | 3 +-- Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasRunManager.cxx | 3 +-- .../G4Atlas/G4AtlasAlg/src/G4AtlasWorkerRunManager.cxx | 3 +-- .../G4UserActions/src/AthenaTrackingAction.cxx | 3 +-- Simulation/G4Utilities/G4UserActions/src/G4SimTimer.cxx | 3 +-- .../G4UserActions/src/MomentumConservation.cxx | 3 +-- TileCalorimeter/TileDetDescr/src/TileCellDim.cxx | 3 +-- TileCalorimeter/TileDetDescr/src/TileDddbManager.cxx | 3 +-- TileCalorimeter/TileRecUtils/src/TileCorrelation.cxx | 2 +- .../TileSvc/TileByteStream/src/TileROD_Encoder.cxx | 2 +- .../TrigHTTBanks/src/HTTFitConstantBank.cxx | 3 +-- .../TrigT2CaloCommon/src/TestCaloDataAccess.cxx | 3 +-- .../TrigT1CaloCalibTools/src/L1CaloPprPhos4Shape.cxx | 3 +-- .../src/L1CaloPprPhos4ShapeCollection.cxx | 3 +-- .../TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx | 4 ++-- Trigger/TrigT1/TrigT1TGC/src/TGCBIS78CoincidenceMap.cxx | 3 +-- Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx | 6 +++--- Trigger/TrigT1/TrigT1TGC/src/TGCEIFICoincidenceMap.cxx | 7 +++---- Trigger/TrigT1/TrigT1TGC/src/TGCNSWCoincidenceMap.cxx | 3 +-- 85 files changed, 100 insertions(+), 172 deletions(-) diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx index 7ffcbc6dddf..806183f11a1 100755 --- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx +++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx @@ -19,7 +19,7 @@ CaloMgrDetDescrCnv::CaloMgrDetDescrCnv(ISvcLocator* svcloc) : DetDescrConverter(ClassID_traits::ID(), svcloc) - , AthMessaging(Athena::getMessageSvc(), "CaloMgrDetDescrCnv") + , AthMessaging("CaloMgrDetDescrCnv") { } diff --git a/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx b/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx index ee8172b4182..b25e9b653b7 100755 --- a/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx +++ b/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx @@ -7,7 +7,6 @@ #include "CaloIdentifier/LArEM_ID.h" #include "CaloIdentifier/LArHEC_ID.h" #include "CaloIdentifier/LArFCAL_ID.h" -#include "AthenaKernel/getMessageSvc.h" #include "GaudiKernel/MsgStream.h" #include "GaudiKernel/ServiceHandle.h" @@ -16,7 +15,7 @@ #include LArTTCellMap::LArTTCellMap( ) - : AthMessaging (Athena::getMessageSvc(), "LArTTCellMap") + : AthMessaging ("LArTTCellMap") { } diff --git a/Control/AthViews/src/DebugView.cxx b/Control/AthViews/src/DebugView.cxx index 898b073cef4..c180f8f6b33 100644 --- a/Control/AthViews/src/DebugView.cxx +++ b/Control/AthViews/src/DebugView.cxx @@ -4,12 +4,11 @@ #include "AthViews/DebugView.h" #include "AthViews/View.h" -#include "AthenaKernel/getMessageSvc.h" DebugView::DebugView( std::string const& Name, bool AllowFallThrough, std::string const& storeName ) : SimpleView( Name, AllowFallThrough, storeName ), - AthMessaging( Athena::getMessageSvc(), Name ) + AthMessaging( Name ) { } diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx index 38d3687d340..3d834761719 100644 --- a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx +++ b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx @@ -15,7 +15,6 @@ ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // non-MT EventLoopMgr // Athena includes #include "AthenaBaseComps/AthMsgStreamMacros.h" -#include "AthenaKernel/getMessageSvc.h" #include "AthenaKernel/errorcheck.h" #include "AthenaKernel/IEventSeek.h" #include "AthenaKernel/IAthenaEvtLoopPreSelectTool.h" @@ -61,7 +60,7 @@ ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // non-MT EventLoopMgr AthenaEventLoopMgr::AthenaEventLoopMgr(const std::string& nam, ISvcLocator* svcLoc) : MinimalEventLoopMgr(nam, svcLoc), - AthMessaging (Athena::getMessageSvc(), nam), + AthMessaging (nam), m_incidentSvc ( "IncidentSvc", nam ), m_eventStore( "StoreGateSvc", nam ), m_evtSelector(nullptr), m_evtSelCtxt(nullptr), diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx index 86076b879cd..e19718d17f4 100644 --- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx +++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx @@ -13,7 +13,6 @@ // Athena includes #include "AthenaBaseComps/AthMsgStreamMacros.h" #include "PersistentDataModel/AthenaAttributeList.h" -#include "AthenaKernel/getMessageSvc.h" #include "AthenaKernel/errorcheck.h" #include "AthenaKernel/IEventSeek.h" #include "AthenaKernel/IEvtSelectorSeek.h" @@ -60,7 +59,7 @@ AthenaHiveEventLoopMgr::AthenaHiveEventLoopMgr(const std::string& nam, ISvcLocator* svcLoc) : MinimalEventLoopMgr(nam, svcLoc), - AthMessaging (Athena::getMessageSvc(), nam), + AthMessaging (nam), m_incidentSvc ( "IncidentSvc", nam ), m_eventStore( "StoreGateSvc", nam ), m_evtSelector(0), m_evtContext(0), diff --git a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx index 53616e869e6..a083db3553a 100644 --- a/Control/PileUpComps/src/PileUpEventLoopMgr.cxx +++ b/Control/PileUpComps/src/PileUpEventLoopMgr.cxx @@ -10,7 +10,6 @@ // Athena includes #include "AthenaBaseComps/AthMsgStreamMacros.h" -#include "AthenaKernel/getMessageSvc.h" #include "AthenaKernel/errorcheck.h" #include "AthenaKernel/ExtendedEventContext.h" #include "AthenaKernel/EventContextClid.h" @@ -55,7 +54,7 @@ PileUpEventLoopMgr::PileUpEventLoopMgr(const std::string& name, ISvcLocator* svcLoc) : MinimalEventLoopMgr(name, svcLoc) - , AthMessaging (Athena::getMessageSvc(), name) + , AthMessaging (name) , m_incidentSvc("IncidentSvc", name) //FIXME should this be configurable? , m_mergeSvc("PileUpMergeSvc", name) , m_evtStore("StoreGateSvc/StoreGateSvc", name) diff --git a/Control/PileUpTools/src/PileUpStream.cxx b/Control/PileUpTools/src/PileUpStream.cxx index 24163c0313e..c1e8547ae60 100755 --- a/Control/PileUpTools/src/PileUpStream.cxx +++ b/Control/PileUpTools/src/PileUpStream.cxx @@ -13,7 +13,6 @@ #include "GaudiKernel/ISvcManager.h" #include "AthenaKernel/CloneService.h" #include "AthenaKernel/IAddressProvider.h" -#include "AthenaKernel/getMessageSvc.h" #include "StoreGate/StoreGateSvc.h" #include "SGTools/DataProxy.h" @@ -27,7 +26,7 @@ class IOpaqueAddress; /// Structors PileUpStream::PileUpStream(): - AthMessaging (Athena::getMessageSvc(), "PileUpStream"), + AthMessaging ("PileUpStream"), m_name("INVALID"), p_svcLoc(0), p_sel(0), p_SG(0), p_iter(0), p_mergeSvc(nullptr), m_ownEvtIterator(false), m_neverLoaded(true), m_ownStore(false), @@ -36,7 +35,7 @@ PileUpStream::PileUpStream(): } PileUpStream::PileUpStream(PileUpStream&& rhs): - AthMessaging (Athena::getMessageSvc(), rhs.m_name), + AthMessaging (rhs.m_name), m_name(rhs.m_name), p_svcLoc(rhs.p_svcLoc), p_sel(rhs.p_sel), p_SG(rhs.p_SG), p_iter(rhs.p_iter), p_mergeSvc(rhs.p_mergeSvc), m_ownEvtIterator(rhs.m_ownEvtIterator), m_neverLoaded(rhs.m_neverLoaded), m_ownStore(rhs.m_ownStore), @@ -71,7 +70,7 @@ PileUpStream::operator=(PileUpStream&& rhs) { PileUpStream::PileUpStream(const std::string& name, ISvcLocator* svcLoc, IEvtSelector* sel): - AthMessaging (Athena::getMessageSvc(), name), + AthMessaging (name), m_name(name), p_svcLoc(svcLoc), p_sel(sel), p_SG(0), p_iter(0), m_ownEvtIterator(false), m_neverLoaded(true), m_ownStore(false), @@ -91,7 +90,7 @@ PileUpStream::PileUpStream(const std::string& name, PileUpStream::PileUpStream(const std::string& name, ISvcLocator* svcLoc, const std::string& selecName): - AthMessaging (Athena::getMessageSvc(), name), + AthMessaging (name), m_name(name), p_svcLoc(svcLoc), p_sel(0), p_SG(0), p_iter(0), m_ownEvtIterator(false), m_neverLoaded(true), m_ownStore(false), diff --git a/Database/IOVDbSvc/src/IOVDbFolder.cxx b/Database/IOVDbSvc/src/IOVDbFolder.cxx index a6960c791b1..fd92b293b36 100644 --- a/Database/IOVDbSvc/src/IOVDbFolder.cxx +++ b/Database/IOVDbSvc/src/IOVDbFolder.cxx @@ -33,7 +33,6 @@ #include "CoraCool/CoraCoolObject.h" #include "CoraCool/CoraCoolObjectIter.h" -#include "AthenaKernel/getMessageSvc.h" #include "AthenaPoolUtilities/AthenaAttributeList.h" #include "AthenaPoolUtilities/AthenaAttrListAddress.h" #include "AthenaPoolUtilities/CondAttrListCollection.h" @@ -75,7 +74,7 @@ IOVDbFolder::IOVDbFolder(IOVDbConn* conn, IClassIDSvc* clidsvc, IIOVDbMetaDataTool* metadatatool, const bool checklock, const bool outputToFile, const std::string & source): - AthMessaging(Athena::getMessageSvc(), "IOVDbFolder"), + AthMessaging("IOVDbFolder"), p_clidSvc(clidsvc), p_metaDataTool(metadatatool), m_conn(conn), diff --git a/Database/RDBAccessSvc/src/SqliteRecordset.cxx b/Database/RDBAccessSvc/src/SqliteRecordset.cxx index b6eb51f05f1..8ab2087ba5d 100755 --- a/Database/RDBAccessSvc/src/SqliteRecordset.cxx +++ b/Database/RDBAccessSvc/src/SqliteRecordset.cxx @@ -10,7 +10,6 @@ */ #include "SqliteRecordset.h" -#include "AthenaKernel/getMessageSvc.h" #include #include @@ -18,7 +17,7 @@ #include SqliteRecordset::SqliteRecordset() - : AthMessaging(Athena::getMessageSvc(), "SqliteRecordset") + : AthMessaging("SqliteRecordset") , m_nodeName("") , m_def(std::make_shared()) { diff --git a/DetectorDescription/ReadoutGeometryBase/src/SiCommonItems.cxx b/DetectorDescription/ReadoutGeometryBase/src/SiCommonItems.cxx index 9d038fc3cb9..ae38f61644c 100644 --- a/DetectorDescription/ReadoutGeometryBase/src/SiCommonItems.cxx +++ b/DetectorDescription/ReadoutGeometryBase/src/SiCommonItems.cxx @@ -3,12 +3,11 @@ */ #include "ReadoutGeometryBase/SiCommonItems.h" -#include "AthenaKernel/getMessageSvc.h" namespace InDetDD { SiCommonItems::SiCommonItems(const AtlasDetectorID* const idHelper) - : AthMessaging(Athena::getMessageSvc(), "SiDetectorElement"), + : AthMessaging("SiDetectorElement"), m_idHelper(idHelper), m_lorentzAngleTool(nullptr) {} diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_CenterGravity.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_CenterGravity.cxx index 4eba8f5ae3a..137eb8709ae 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_CenterGravity.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_CenterGravity.cxx @@ -2,13 +2,12 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "ALFA_LocRec/ALFA_CenterGravity.h" using namespace std; ALFA_CenterGravity::ALFA_CenterGravity() : - AthMessaging(Athena::getMessageSvc(), "ALFA_CenterGravity") + AthMessaging("ALFA_CenterGravity") { m_histU_PT = NULL; m_histV_PT = NULL; diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_EdgeMethod.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_EdgeMethod.cxx index 527f7a8bc25..dc41ba1a807 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_EdgeMethod.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_EdgeMethod.cxx @@ -2,7 +2,6 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "ALFA_LocRec/ALFA_EdgeMethod.h" #include @@ -14,7 +13,7 @@ ALFA_EdgeMethod::ALFA_EdgeMethod() : } ALFA_EdgeMethod::ALFA_EdgeMethod(Bool_t bOpt_Sisters, Bool_t bOpt_UseGaps) : - AthMessaging(Athena::getMessageSvc(), "ALFA_EdgeMethod") + AthMessaging("ALFA_EdgeMethod") { m_bOpt_Sisters = bOpt_Sisters; m_bOpt_UseGaps = bOpt_UseGaps; diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_HalfReco.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_HalfReco.cxx index 8dabde2b349..94920e256ae 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_HalfReco.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_HalfReco.cxx @@ -2,11 +2,10 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "ALFA_LocRec/ALFA_HalfReco.h" ALFA_HalfReco::ALFA_HalfReco() : - AthMessaging(Athena::getMessageSvc(), "ALFA_HalfReco") + AthMessaging("ALFA_HalfReco") { ATH_MSG_DEBUG("begin ALFA_HalfReco::ALFA_HalfReco"); diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDGap.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDGap.cxx index 237495d38d5..0114bd90537 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDGap.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDGap.cxx @@ -2,11 +2,10 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "ALFA_LocRec/ALFA_MDGap.h" ALFA_MDGap::ALFA_MDGap() : - AthMessaging(Athena::getMessageSvc(), "ALFA_MDGap") + AthMessaging("ALFA_MDGap") { memset(&m_faMD, 0, sizeof(m_faMD)); memset(&m_fbMD, 0, sizeof(m_fbMD)); diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDMultiple.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDMultiple.cxx index e20bc7afbea..e7373f6cd4b 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDMultiple.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDMultiple.cxx @@ -2,12 +2,11 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "ALFA_LocRec/ALFA_MDMultiple.h" #include // std::copy ALFA_MDMultiple::ALFA_MDMultiple() : - AthMessaging(Athena::getMessageSvc(), "ALFA_MDMultiple") + AthMessaging("ALFA_MDMultiple") { memset(&m_iNumHitsLayer, 0.0, sizeof(m_iNumHitsLayer)); @@ -44,7 +43,7 @@ ALFA_MDMultiple::ALFA_MDMultiple() : } ALFA_MDMultiple::ALFA_MDMultiple(const ALFA_MDMultiple &obj) : - AthMessaging(Athena::getMessageSvc(), "ALFA_MDMultiple") + AthMessaging("ALFA_MDMultiple") { // std::copy(obj.m_iNumHitsLayer, obj.m_iNumHitsLayer + sizeof(obj.m_iNumHitsLayer)/sizeof(Int_t), m_iNumHitsLayer); std::copy(obj.m_iNumHitsLayer, obj.m_iNumHitsLayer + ALFALAYERSCNT*ALFAPLATESCNT, m_iNumHitsLayer); diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDOverlap.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDOverlap.cxx index 0d28090230d..37076915941 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDOverlap.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDOverlap.cxx @@ -2,12 +2,11 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "ALFA_LocRec/ALFA_MDOverlap.h" using namespace std; ALFA_MDOverlap::ALFA_MDOverlap() : - AthMessaging(Athena::getMessageSvc(), "ALFA_MDOverlap") + AthMessaging("ALFA_MDOverlap") { m_histU_PT = NULL; m_histV_PT = NULL; diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDTracking.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDTracking.cxx index 752a8a44257..513b7144563 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDTracking.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_MDTracking.cxx @@ -2,11 +2,10 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "ALFA_LocRec/ALFA_MDTracking.h" ALFA_MDTracking::ALFA_MDTracking() : - AthMessaging(Athena::getMessageSvc(), "ALFA_MDTracking") + AthMessaging("ALFA_MDTracking") { ATH_MSG_DEBUG("begin ALFA_MDTracking::ALFA_MDTracking"); diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_ODTracking.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_ODTracking.cxx index 2abae119846..05f64b0dfcd 100644 --- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_ODTracking.cxx +++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/ALFA_ODTracking.cxx @@ -2,13 +2,12 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "ALFA_LocRec/ALFA_ODTracking.h" using namespace std; ALFA_ODTracking::ALFA_ODTracking() : - AthMessaging(Athena::getMessageSvc(), "ALFA_ODTracking") + AthMessaging("ALFA_ODTracking") { m_listResults.clear(); diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_DigitByteStreamCnv.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_DigitByteStreamCnv.cxx index cb40780c001..bdc977708b4 100644 --- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_DigitByteStreamCnv.cxx +++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/LUCID_DigitByteStreamCnv.cxx @@ -2,12 +2,11 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h" LUCID_DigitByteStreamCnv::LUCID_DigitByteStreamCnv(ISvcLocator* svcloc) : Converter(storageType(), classID(), svcloc), - AthMessaging(Athena::getMessageSvc(), "LUCID_DigitByteStreamCnv"), + AthMessaging("LUCID_DigitByteStreamCnv"), m_RodBlockVersion (0), m_BCs_per_LVL1ID (1) { diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx index 503117fd0c4..8b6a128a120 100644 --- a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx +++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx @@ -23,7 +23,6 @@ #include "GaudiKernel/SystemOfUnits.h" #include "GeoModelInterfaces/StoredMaterialManager.h" -#include "AthenaKernel/getMessageSvc.h" // Author Soumya Mohapatra // soumya@cern.ch @@ -41,7 +40,7 @@ using namespace GeoGenfun; using namespace GeoXF; ZDC_DetFactory::ZDC_DetFactory(StoreGateSvc* detStore) - : AthMessaging (Athena::getMessageSvc(), "ZDC_DetFactory"), + : AthMessaging ("ZDC_DetFactory"), m_detectorManager(nullptr) , m_detectorStore(detStore) {} diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx index add00d497c3..2d6f0828b9d 100644 --- a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx +++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetManager.cxx @@ -3,10 +3,9 @@ */ #include "ZDC_DetManager.h" -#include "AthenaKernel/getMessageSvc.h" ZDC_DetManager::ZDC_DetManager() - : AthMessaging (Athena::getMessageSvc(), "ZDC_DetManager") + : AthMessaging ("ZDC_DetManager") { setName("ZDC"); diff --git a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModelXml/src/HGTD_GmxInterface.cxx b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModelXml/src/HGTD_GmxInterface.cxx index 2cdbc7f565c..4b74bbd87a5 100644 --- a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModelXml/src/HGTD_GmxInterface.cxx +++ b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModelXml/src/HGTD_GmxInterface.cxx @@ -8,7 +8,6 @@ #include #include -#include #include #include @@ -19,7 +18,7 @@ constexpr int HGTD_HitIndex{2}; HGTD_GmxInterface::HGTD_GmxInterface(HGTD_DetectorManager *detectorManager, InDetDD::SiCommonItems *commonItems) - : AthMessaging(Athena::getMessageSvc(), "HGTD_GmxInterface"), + : AthMessaging("HGTD_GmxInterface"), m_detectorManager(detectorManager), m_commonItems(commonItems) { diff --git a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx index 0062ea66cc9..f99da7b3f34 100644 --- a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx +++ b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_ReadoutGeometry/src/HGTD_DetectorManager.cxx @@ -12,7 +12,7 @@ using InDetDD::HGTD_DetectorElement; using InDetDD::SiCommonItems; HGTD_DetectorManager::HGTD_DetectorManager(StoreGateSvc* detStore) - : AthMessaging(Athena::getMessageSvc(), "HGTD_DetectorManager"), + : AthMessaging("HGTD_DetectorManager"), m_idHelper(0) { setName("HGTD"); diff --git a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx index e2b31f999e6..edca2a9e705 100644 --- a/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx +++ b/InnerDetector/InDetDetDescr/BCMPrimeGeoModelXml/src/BCMPrimeGmxInterface.cxx @@ -4,7 +4,6 @@ #include "BCMPrimeGmxInterface.h" -#include "AthenaKernel/getMessageSvc.h" #include "BCMPrimeReadoutGeometry/BCMPrimeDetectorManager.h" #include "InDetSimEvent/SiHitIdHelper.h" @@ -12,7 +11,7 @@ namespace InDetDD { BCMPrimeGmxInterface::BCMPrimeGmxInterface(BCMPrimeDetectorManager *detectorManager) - : AthMessaging(Athena::getMessageSvc(), "BCMPrimeGmxInterface"), + : AthMessaging("BCMPrimeGmxInterface"), m_detectorManager(detectorManager) {} diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetDDAthenaComps.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetDDAthenaComps.cxx index babe932157b..43b88c2928a 100755 --- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetDDAthenaComps.cxx +++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetDDAthenaComps.cxx @@ -3,11 +3,10 @@ */ #include "InDetGeoModelUtils/InDetDDAthenaComps.h" -#include "AthenaKernel/getMessageSvc.h" namespace InDetDD { AthenaComps::AthenaComps(const std::string& msgStreamName) - : AthMessaging(Athena::getMessageSvc(), msgStreamName), + : AthMessaging(msgStreamName), m_detStore(nullptr), m_geoDbTagSvc(nullptr), m_rdbAccessSvc(nullptr), diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetMaterialManager.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetMaterialManager.cxx index 59738c0d853..46ebefd55ea 100755 --- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetMaterialManager.cxx +++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetMaterialManager.cxx @@ -2,7 +2,6 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "InDetGeoModelUtils/InDetMaterialManager.h" #include "InDetGeoModelUtils/InDetDDAthenaComps.h" #include "GeoModelInterfaces/StoredMaterialManager.h" @@ -23,7 +22,7 @@ // Constructor InDetMaterialManager::InDetMaterialManager(const std::string& managerName, StoreGateSvc* detStore) - : AthMessaging(Athena::getMessageSvc(), managerName), + : AthMessaging(managerName), m_managerName(managerName), m_extraFunctionality(false), m_athenaComps(nullptr) { @@ -36,7 +35,7 @@ InDetMaterialManager::InDetMaterialManager(const std::string& managerName, const IRDBRecordset_ptr& weightTable, const std::string& space, bool extraFunctionality) - : AthMessaging(Athena::getMessageSvc(), managerName), + : AthMessaging(managerName), m_managerName(managerName), m_extraFunctionality(extraFunctionality), m_athenaComps(nullptr) { @@ -55,7 +54,7 @@ InDetMaterialManager::InDetMaterialManager(const std::string& managerName, Store const IRDBRecordset_ptr& weightTable, const IRDBRecordset_ptr& compositionTable, const std::string& space) - : AthMessaging(Athena::getMessageSvc(), managerName), + : AthMessaging(managerName), m_managerName(managerName), m_extraFunctionality(true), m_athenaComps(nullptr) { @@ -67,7 +66,7 @@ InDetMaterialManager::InDetMaterialManager(const std::string& managerName, Store InDetMaterialManager::InDetMaterialManager(const std::string& managerName, InDetDD::AthenaComps* athenaComps) - : AthMessaging(Athena::getMessageSvc(), managerName), + : AthMessaging(managerName), m_managerName(managerName), m_extraFunctionality(true), m_athenaComps(athenaComps) { diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeBuilder.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeBuilder.cxx index 4294d51d6be..8833482bcd2 100755 --- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeBuilder.cxx +++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeBuilder.cxx @@ -2,7 +2,6 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "InDetGeoModelUtils/VolumeBuilder.h" #include "InDetGeoModelUtils/ServiceVolume.h" #include "InDetGeoModelUtils/InDetMaterialManager.h" @@ -17,7 +16,7 @@ namespace InDetDD { VolumeBuilder::VolumeBuilder(const Zone& zone, const std::vector& services) - : AthMessaging(Athena::getMessageSvc(), "InDetDDVolumeBuilder"), + : AthMessaging("InDetDDVolumeBuilder"), m_region("None"), // Empty refers to a valid region. Set some default so we can check it is actually set. m_zcenter(0), m_services(nullptr), @@ -28,7 +27,7 @@ namespace InDetDD { } VolumeBuilder::VolumeBuilder(const std::vector& services) - : AthMessaging(Athena::getMessageSvc(), "InDetDDVolumeBuilder"), + : AthMessaging("InDetDDVolumeBuilder"), m_region("None"), // Empty refers to a valid region. Set some default so we can check it is actually set. m_zcenter(0), m_services(&services), @@ -40,7 +39,7 @@ namespace InDetDD { VolumeBuilder::VolumeBuilder(const Zone& zone, const std::vector& services, const std::vector& servEnvelope, const std::vector& servChild) - : AthMessaging(Athena::getMessageSvc(), "InDetDDVolumeBuilder"), + : AthMessaging("InDetDDVolumeBuilder"), m_region("None"), // Empty refers to a valid region. Set some default so we can check it is actually set. m_zcenter(0), m_services(nullptr), diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx index fa972a5044c..86f6d971652 100755 --- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx +++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx @@ -11,7 +11,6 @@ #include "GeoPrimitives/CLHEPtoEigenConverter.h" #include "AthenaPoolUtilities/CondAttrListCollection.h" #include "AthenaBaseComps/AthMsgStreamMacros.h" -#include "AthenaKernel/getMessageSvc.h" #include @@ -19,7 +18,7 @@ namespace InDetDD { InDetDetectorManager::InDetDetectorManager(StoreGateSvc * detStore, const std::string & name) - : AthMessaging(Athena::getMessageSvc(), name+"DetectorManager"), + : AthMessaging(name+"DetectorManager"), m_alignfoldertype{none},m_detStore(detStore), m_suppressWarnings(false) { diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactoryFS.cxx index 1d8a05a012f..738f4ad5d67 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactoryFS.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactoryFS.cxx @@ -18,7 +18,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "RDBAccessSvc/IRDBRecord.h" #include "RDBAccessSvc/IRDBRecordset.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -32,7 +31,7 @@ EndPlateFactoryFS::EndPlateFactoryFS(StoreGateSvc *detStore, ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "EndPlateFactoryFS"), + AthMessaging("EndPlateFactoryFS"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)) { diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx index dcfe1deaa27..f28c74ff70f 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx @@ -5,7 +5,6 @@ #include -#include "AthenaKernel/getMessageSvc.h" #include "InDetServMatGeoModel/InDetServMatFactoryDC2.h" // Pixel, SCT and TRT factories @@ -30,7 +29,7 @@ #include "GaudiKernel/SystemOfUnits.h" InDetServMatFactoryDC2::InDetServMatFactoryDC2(StoreGateSvc *detStore,ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "InDetServMatFactoryDC2"), + AthMessaging("InDetServMatFactoryDC2"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)), m_manager(nullptr) diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx index 32740401527..f689f50793f 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx @@ -38,7 +38,7 @@ InDetServMatFactoryFS::InDetServMatFactoryFS(StoreGateSvc *detStore,ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "InDetServMatFactoryFS"), + AthMessaging("InDetServMatFactoryFS"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)), m_manager(nullptr) diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx index 8200041a4c3..44b58accfc1 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx @@ -21,7 +21,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "RDBAccessSvc/IRDBRecord.h" #include "RDBAccessSvc/IRDBRecordset.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -33,7 +32,7 @@ PixelServMatFactoryDC2::PixelServMatFactoryDC2(StoreGateSvc *detStore, ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "PixelServmatFactoryDC2"), + AthMessaging("PixelServmatFactoryDC2"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)) { diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx index 020d732beb7..feeffd7a001 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx @@ -23,7 +23,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "GaudiKernel/SystemOfUnits.h" #include "GeoModelUtilities/DecodeVersionKey.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -36,7 +35,7 @@ PixelServMatFactoryFS::PixelServMatFactoryFS(StoreGateSvc *detStore, ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "PixelServMatFactoryFS"), + AthMessaging("PixelServMatFactoryFS"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)) { diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/Routing2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/Routing2.cxx index 446429230af..9d3679de6cb 100644 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/Routing2.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/Routing2.cxx @@ -2,7 +2,6 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "InDetServMatGeoModel/Routing2.h" #include "InDetServMatGeoModel/ServicesLayer.h" @@ -14,7 +13,7 @@ using namespace std; Routing2::Routing2(): - AthMessaging(Athena::getMessageSvc(), "Routing2") + AthMessaging("Routing2") { m_routePixelBarrelOnPST = false; m_pixelAlongBarrelStrip = false; diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx index 25954a77f85..301b550fe2e 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx @@ -20,7 +20,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "RDBAccessSvc/IRDBRecord.h" #include "RDBAccessSvc/IRDBRecordset.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -37,7 +36,7 @@ static const int SCTELEMENTSINEL = 8; #include SCT_ServMatFactoryDC2::SCT_ServMatFactoryDC2(StoreGateSvc *detStore,ServiceHandle& pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "SCT_ServMatFactoryDC2"), + AthMessaging("SCT_ServMatFactoryDC2"), m_detStore(detStore), m_rdbAccess(pRDBAccess), m_materialManager(nullptr) diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx index 31bbd5ed6d5..218e449b440 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx @@ -24,7 +24,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "RDBAccessSvc/IRDBRecord.h" #include "RDBAccessSvc/IRDBRecordset.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -35,7 +34,7 @@ #include SCT_ServMatFactoryFS::SCT_ServMatFactoryFS(StoreGateSvc *detStore,ServiceHandle& pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "SCT_ServMatFactoryFS"), + AthMessaging("SCT_ServMatFactoryFS"), m_detStore(detStore), m_rdbAccess(pRDBAccess) { diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx index ad1d2317e53..5f566be3f7c 100644 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx @@ -2,7 +2,6 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "InDetServMatGeoModel/ServicesTracker.h" #include "InDetServMatGeoModel/ServicesLayer.h" @@ -18,7 +17,7 @@ using namespace std; ServicesTracker::ServicesTracker(): - AthMessaging(Athena::getMessageSvc(), "ServicesTracker"), + AthMessaging("ServicesTracker"), m_geoMgr(nullptr) { m_barrelLayers.clear(); diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx index 70e662d046e..02ecdea1008 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx @@ -18,7 +18,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "RDBAccessSvc/IRDBRecord.h" #include "RDBAccessSvc/IRDBRecordset.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -32,7 +31,7 @@ SquirrelCageFactoryFS::SquirrelCageFactoryFS(StoreGateSvc *detStore, ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "SquirrelCageFactoryFS"), + AthMessaging("SquirrelCageFactoryFS"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)) { diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactoryFS.cxx index 825a6cb67ab..7031527f525 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactoryFS.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactoryFS.cxx @@ -19,7 +19,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "RDBAccessSvc/IRDBRecord.h" #include "RDBAccessSvc/IRDBRecordset.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -34,7 +33,7 @@ SupportRailFactoryFS::SupportRailFactoryFS(StoreGateSvc *detStore, ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "SupportRailFactoryFS"), + AthMessaging("SupportRailFactoryFS"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)) { diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx index 99486a46d0d..3963b807b54 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx @@ -19,7 +19,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "RDBAccessSvc/IRDBRecord.h" #include "RDBAccessSvc/IRDBRecordset.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -34,7 +33,7 @@ static const int TRTELEMENTSINEL = 9; TRT_ServMatFactoryDC2::TRT_ServMatFactoryDC2(StoreGateSvc *detStore,ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "ServMatFactoryDC2"), + AthMessaging("ServMatFactoryDC2"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)), m_materialManager(nullptr) diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx index 14e5a42f1b8..54e3b7a726a 100755 --- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx +++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx @@ -21,7 +21,6 @@ // StoreGate includes #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "RDBAccessSvc/IRDBRecord.h" #include "RDBAccessSvc/IRDBRecordset.h" #include "RDBAccessSvc/IRDBAccessSvc.h" @@ -34,7 +33,7 @@ TRT_ServMatFactoryFS::TRT_ServMatFactoryFS(StoreGateSvc *detStore,ServiceHandle pRDBAccess) : - AthMessaging(Athena::getMessageSvc(), "TRT_ServMatFactoryFS"), + AthMessaging("TRT_ServMatFactoryFS"), m_detStore(detStore), m_rdbAccess(std::move(pRDBAccess)) { diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.cxx index 829fdc5d0c0..4b89c7cbc16 100644 --- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.cxx +++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.cxx @@ -33,7 +33,6 @@ #include "GeoModelInterfaces/StoredMaterialManager.h" #include "Identifier/Identifier.h" #include "StoreGate/StoreGateSvc.h" -#include "AthenaKernel/getMessageSvc.h" #include "GaudiKernel/Bootstrap.h" #include "GaudiKernel/ISvcLocator.h" @@ -2265,7 +2264,7 @@ OraclePixGeoManager::getIdHelper() using namespace std; PixelGeometryManager::PixelGeometryManager() : - AthMessaging(Athena::getMessageSvc(), "PixelGeometryManager") + AthMessaging("PixelGeometryManager") { } PixelGeometryManager::~PixelGeometryManager() diff --git a/InnerDetector/InDetDetDescr/PixelGeoModelXml/src/PixelGmxInterface.cxx b/InnerDetector/InDetDetDescr/PixelGeoModelXml/src/PixelGmxInterface.cxx index a45d4a487a4..c6bde076556 100644 --- a/InnerDetector/InDetDetDescr/PixelGeoModelXml/src/PixelGmxInterface.cxx +++ b/InnerDetector/InDetDetDescr/PixelGeoModelXml/src/PixelGmxInterface.cxx @@ -28,7 +28,7 @@ namespace ITk PixelGmxInterface::PixelGmxInterface(PixelDetectorManager *detectorManager, SiCommonItems *commonItems, WaferTree *moduleTree) - : AthMessaging(Athena::getMessageSvc(), "PixelGmxInterface"), + : AthMessaging("PixelGmxInterface"), m_detectorManager(detectorManager), m_commonItems(commonItems), m_moduleTree(moduleTree) diff --git a/InnerDetector/InDetDetDescr/StripGeoModelXml/src/StripGmxInterface.cxx b/InnerDetector/InDetDetDescr/StripGeoModelXml/src/StripGmxInterface.cxx index 2f45f84f0b0..c6190e5ff11 100644 --- a/InnerDetector/InDetDetDescr/StripGeoModelXml/src/StripGmxInterface.cxx +++ b/InnerDetector/InDetDetDescr/StripGeoModelXml/src/StripGmxInterface.cxx @@ -28,7 +28,7 @@ namespace ITk StripGmxInterface::StripGmxInterface(SCT_DetectorManager *detectorManager, SiCommonItems *commonItems, WaferTree *waferTree) - : AthMessaging(Athena::getMessageSvc(), "StripGmxInterface"), + : AthMessaging("StripGmxInterface"), m_detectorManager(detectorManager), m_commonItems(commonItems), m_waferTree(waferTree) diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ElectronPidTool_ToTcalculation.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ElectronPidTool_ToTcalculation.cxx index 41ab2fe0452..c3916b2525c 100644 --- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ElectronPidTool_ToTcalculation.cxx +++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ElectronPidTool_ToTcalculation.cxx @@ -10,7 +10,6 @@ #ifndef TRT_ELECTRONPID_TOTCALCULATION_CXX #define TRT_ELECTRONPID_TOTCALCULATION_CXX -#include "AthenaKernel/getMessageSvc.h" #include /*****************************************************************************\ @@ -33,7 +32,7 @@ InDet::TRT_ElectronPidTool::ToTcalculator::ToTcalculator(AthAlgTool & parent): BaseTRTPIDCalculator(parent,(SIZE_OF_HEADER + SIZE_GAUS_PARS * 2 + SIZE_TOT_CONSTANTS + SIZE_PAR_VAL),"ToT"), - AthMessaging(Athena::getMessageSvc(), "ToTcalculator"), + AthMessaging("ToTcalculator"), ToTCorrectionConstants( (float*)( Blob + OFF_TOT_CONSTANTS )), gausParametersElectron( (float*)( Blob + OFF_GAUS_PARS_ELE )), gausParametersPion( (float*)( Blob + OFF_GAUS_PARS_PIO )), diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/TRT_PAI_effectiveGas.cxx b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/TRT_PAI_effectiveGas.cxx index 8fb2bf40518..ac42d2e6a1b 100644 --- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/TRT_PAI_effectiveGas.cxx +++ b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/TRT_PAI_effectiveGas.cxx @@ -16,7 +16,6 @@ #include #include //for std::max, std::clamp -#include "AthenaKernel/getMessageSvc.h" #include "CLHEP/Units/SystemOfUnits.h" //____________________________________________________________________________ @@ -26,7 +25,7 @@ TRT_PAI_effectiveGas::TRT_PAI_effectiveGas(TRT_PAI_gasMixture * gm, double Emax, double tempK, double eps) - : AthMessaging(Athena::getMessageSvc(), "TRT_PAI_effectiveGas"), + : AthMessaging("TRT_PAI_effectiveGas"), m_lnEmin(std::log(Emin)), m_lnEmax(std::log(Emax)), m_eps(eps) diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/TRT_PAI_gasMixture.cxx b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/TRT_PAI_gasMixture.cxx index ea6bbf158fe..5f54a15db1c 100644 --- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/TRT_PAI_gasMixture.cxx +++ b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/TRT_PAI_gasMixture.cxx @@ -2,7 +2,6 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "TRT_PAI_gasMixture.h" #include "TRT_PAI_gasComponent.h" @@ -12,7 +11,7 @@ //____________________________________________________________________________ TRT_PAI_gasMixture::TRT_PAI_gasMixture(const std::string& nm) : - AthMessaging(Athena::getMessageSvc(), nm), + AthMessaging(nm), m_name(nm), m_gasFrozen(0) {}; diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx index aadb2f06f49..22d01e459b0 100644 --- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx +++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRRegionXMLHandler.cxx @@ -10,7 +10,6 @@ #include "TRTTransitionRadiation.h" // Athena includes -#include "AthenaKernel/getMessageSvc.h" #include "IdDictDetDescr/IdDictManager.h" // Gaudi includes @@ -31,7 +30,7 @@ #include TRRegionXMLHandler::TRRegionXMLHandler(TRTTransitionRadiation *tr) : - AthMessaging(Athena::getMessageSvc(), "TRRegionXMLHandler"), + AthMessaging("TRRegionXMLHandler"), m_theProcess(tr), m_storeGate(nullptr), m_initialLayoutIdDict(false) diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx index 83c4dfd4283..9d036002e11 100644 --- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx +++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/TRTTransitionRadiation.cxx @@ -12,7 +12,6 @@ #include "TRRegionXMLHandler.h" // Athena includes -#include "AthenaKernel/getMessageSvc.h" #include "CLHEP/Random/RandGaussZiggurat.h" #include "GeoModelInterfaces/StoredMaterialManager.h" //Material Manager #include "GeoMaterial2G4/Geo2G4MaterialFactory.h" //Converting GeoMaterial -> G4Material @@ -42,7 +41,7 @@ TRTTransitionRadiation::TRTTransitionRadiation( const G4String& processName, const std::string & xmlfilename) : G4VDiscreteProcess(processName,fElectromagnetic), - AthMessaging(Athena::getMessageSvc(), "TRTTransitionRadiation"), + AthMessaging("TRTTransitionRadiation"), m_XMLhandler(nullptr),m_xmlfilename(xmlfilename), m_MinEnergyTR(0.0),m_MaxEnergyTR(0.0),m_NumBins(0),m_WplasmaGas(0.0), m_WplasmaFoil(0.0),m_GammaMin(0.0),m_EkinMin(0.0),m_Ey(nullptr),m_Sr(nullptr), diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPlotBase.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPlotBase.cxx index 885cf85b39c..571f220f190 100644 --- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPlotBase.cxx +++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPlotBase.cxx @@ -9,7 +9,6 @@ #include "InDetPlotBase.h" // bring Athena/Gaudi utilities in scope -#include "AthenaKernel/getMessageSvc.h" #include "GaudiKernel/Bootstrap.h" #include "GaudiKernel/ISvcLocator.h" #include "GaudiKernel/Service.h" @@ -39,7 +38,7 @@ namespace { InDetPlotBase::InDetPlotBase(InDetPlotBase* pParent, const std::string& dirName) : - PlotBase(pParent, dirName), AthMessaging(Athena::getMessageSvc(), "InDetPlotBase"), m_histoDefSvc(nullptr) { + PlotBase(pParent, dirName), AthMessaging("InDetPlotBase"), m_histoDefSvc(nullptr) { // nop } diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ResolutionHelper.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ResolutionHelper.cxx index 5765cbe124f..a2a3e217e1d 100644 --- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ResolutionHelper.cxx +++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ResolutionHelper.cxx @@ -8,7 +8,6 @@ * @author Max Baugh, Liza Mijovic, Nora Pettersson **/ -#include "AthenaKernel/getMessageSvc.h" #include "InDetPhysValMonitoring/ResolutionHelper.h" #include "TH1.h" #include "TH1D.h" @@ -23,7 +22,7 @@ namespace IDPVM { ResolutionHelper::ResolutionHelper() : - AthMessaging(Athena::getMessageSvc(), "ResolutionHelper") + AthMessaging("ResolutionHelper") { } diff --git a/LArCalorimeter/LArCOOLConditions/src/LArCondFlatBase.cxx b/LArCalorimeter/LArCOOLConditions/src/LArCondFlatBase.cxx index 8b91bf4c119..bc179fb1ad5 100644 --- a/LArCalorimeter/LArCOOLConditions/src/LArCondFlatBase.cxx +++ b/LArCalorimeter/LArCOOLConditions/src/LArCondFlatBase.cxx @@ -14,11 +14,10 @@ #include "GaudiKernel/ISvcLocator.h" #include "StoreGate/StoreGateSvc.h" #include "StoreGate/DataHandle.h" -#include "AthenaKernel/getMessageSvc.h" #include "AthenaBaseComps/AthCheckMacros.h" LArCondFlatBase::LArCondFlatBase (const std::string& name) : - AthMessaging(Athena::getMessageSvc(), name), + AthMessaging(name), m_isInitialized(false), m_onlineHelper(NULL) { diff --git a/LArCalorimeter/LArCOOLConditions/src/LArCondSuperCellBase.cxx b/LArCalorimeter/LArCOOLConditions/src/LArCondSuperCellBase.cxx index cfe5b28d811..273a8efae69 100644 --- a/LArCalorimeter/LArCOOLConditions/src/LArCondSuperCellBase.cxx +++ b/LArCalorimeter/LArCOOLConditions/src/LArCondSuperCellBase.cxx @@ -14,11 +14,10 @@ #include "GaudiKernel/ISvcLocator.h" #include "StoreGate/StoreGateSvc.h" #include "StoreGate/DataHandle.h" -#include "AthenaKernel/getMessageSvc.h" #include "AthenaBaseComps/AthCheckMacros.h" LArCondSuperCellBase::LArCondSuperCellBase(const std::string& name) : - AthMessaging(Athena::getMessageSvc(), name), + AthMessaging(name), m_isInitialized(false), m_scOnlineID(NULL) { diff --git a/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx b/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx index e177849d577..b66c6ab4b4e 100644 --- a/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx +++ b/LArCalorimeter/LArCabling/src/LArHVIdMappingReader.cxx @@ -14,13 +14,12 @@ #include "LArIdentifier/LArHVLineID.h" #include "PathResolver/PathResolver.h" #include "AthenaPoolUtilities/AthenaAttributeList.h" -#include "AthenaKernel/getMessageSvc.h" #include #include LArHVIdMappingReader::LArHVIdMappingReader() - : AthMessaging (Athena::getMessageSvc(), "LArHVIdMappingReader") + : AthMessaging ("LArHVIdMappingReader") { } diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx index 41425dcd14b..d7ef9dd9f70 100755 --- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx +++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactoryLite.cxx @@ -35,7 +35,7 @@ LArGeo::LArDetectorFactoryLite::LArDetectorFactoryLite(StoreGateSvc* detStore , IRDBAccessSvc* paramSvc , GeoModelIO::ReadGeoModel* sqliteReader , const LArHVManager* hvManager) - : AthMessaging(Athena::getMessageSvc(), "LArDetectorFactoryLite") + : AthMessaging("LArDetectorFactoryLite") , m_detectorManager(nullptr) , m_detStore(detStore) , m_paramSvc(paramSvc) diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx b/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx index 82a80d3a673..6424e3e5312 100644 --- a/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx +++ b/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArAlignHelper.cxx @@ -13,7 +13,7 @@ #include "GeoPrimitives/CLHEPtoEigenConverter.h" LArAlignHelper::LArAlignHelper() - : AthMessaging(Athena::getMessageSvc(), "LArAlignHelper") + : AthMessaging("LArAlignHelper") { } diff --git a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcSlbDataHelper.cxx b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcSlbDataHelper.cxx index ace4b096237..d34ab0a5bdb 100644 --- a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcSlbDataHelper.cxx +++ b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcSlbDataHelper.cxx @@ -17,10 +17,9 @@ #include "TgcSlbDataHelper.h" #include "MuonRDO/TgcRawData.h" #include "TgcSlbData.h" -#include "AthenaKernel/getMessageSvc.h" Muon::TgcSlbDataHelper::TgcSlbDataHelper(void) - : AthMessaging (Athena::getMessageSvc(), "Muon::TgcSlbDataHelper") + : AthMessaging ("Muon::TgcSlbDataHelper") { } diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx index 496044a4f6b..1a63b670a92 100644 --- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx +++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx @@ -3,7 +3,6 @@ */ /// PROJECTS -#include "AthenaKernel/getMessageSvc.h" #include "MM_Digitization/MM_StripsResponseSimulation.h" #include "MM_Digitization/MM_IonizationCluster.h" #include "MM_Digitization/MM_StripResponse.h" @@ -37,7 +36,7 @@ namespace { /*******************************************************************************/ MM_StripsResponseSimulation::MM_StripsResponseSimulation(): - AthMessaging(Athena::getMessageSvc(), "MMStripResponseSimulation"), + AthMessaging("MMStripResponseSimulation"), // Variables that should be set externally (MM_DigitizationTool) m_qThreshold(0), // 0.001 diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx index 7693e245427..f94d4d6fe2c 100644 --- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx +++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx @@ -31,7 +31,7 @@ TgcDigitMaker::TgcDigitMaker(TgcHitIdHelper* hitIdHelper, const MuonGM::MuonDetectorManager* mdManager, unsigned int runperiod) - : AthMessaging (Athena::getMessageSvc(), "TgcDigitMaker") + : AthMessaging ("TgcDigitMaker") { m_hitIdHelper = hitIdHelper; m_mdManager = mdManager; diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcVMMSim.h b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcVMMSim.h index ca691d03d8c..057b03b186e 100644 --- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcVMMSim.h +++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcVMMSim.h @@ -19,7 +19,6 @@ #include #include -#include "AthenaKernel/getMessageSvc.h" #include "AthenaBaseComps/AthMessaging.h" #include "MuonDigitContainer/MuonDigit.h" #include "MuonDigitContainer/sTgcDigitContainer.h" @@ -46,7 +45,7 @@ public: float readWindow, bool readDeadDigits, int typeOfChannel) - : AthMessaging(Athena::getMessageSvc(), "sTgcVMMSim") + : AthMessaging("sTgcVMMSim") , m_deadtimeStart(-9999) , m_readtimeStart(-9999) , m_digitsIn(std::move(inputDigits)) diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitMaker.cxx b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitMaker.cxx index 14f28db8498..9d47d9ffb83 100644 --- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitMaker.cxx +++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitMaker.cxx @@ -35,7 +35,7 @@ sTgcDigitMaker::sTgcDigitMaker(const sTgcHitIdHelper* hitIdHelper, const MuonGM::MuonDetectorManager* mdManager, bool doEfficiencyCorrection) - : AthMessaging (Athena::getMessageSvc(), "sTgcDigitMaker") + : AthMessaging ("sTgcDigitMaker") { m_hitIdHelper = hitIdHelper; m_mdManager = mdManager; diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/Root/PrdTesterModule.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/Root/PrdTesterModule.cxx index 5ab7b2a9444..dc01b4a24b1 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/Root/PrdTesterModule.cxx +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/Root/PrdTesterModule.cxx @@ -2,12 +2,11 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include #include #include namespace MuonPRDTest { PrdTesterModule::PrdTesterModule(MuonTesterTree& tree, const std::string& grp_name, bool useCondGeo, MSG::Level msglvl) : - MuonTesterBranch(tree, " prd module " + grp_name), AthMessaging(Athena::getMessageSvc(), grp_name), m_useCondDetMgr{useCondGeo} { + MuonTesterBranch(tree, " prd module " + grp_name), AthMessaging(grp_name), m_useCondDetMgr{useCondGeo} { setLevel(msglvl); m_idHelperSvc.retrieve().ignore(); } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h index 0c67ae31051..541cfbb0b70 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/ValAlgVariables.h @@ -6,7 +6,6 @@ #define VALALGVARIABLES_H #include "AthenaBaseComps/AthMessaging.h" -#include "AthenaKernel/getMessageSvc.h" #include "GaudiKernel/ServiceHandle.h" #include "StoreGate/StoreGateSvc.h" @@ -25,7 +24,7 @@ class ValAlgVariables : public AthMessaging TTree* tree, const std::string& containername, MSG::Level msglvl) : - AthMessaging(Athena::getMessageSvc(), containername), + AthMessaging(containername), m_evtStore(evtStore), m_detManager(detManager), m_tree(tree), diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/ParticleCandidateList.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/ParticleCandidateList.cxx index 566aa3c6790..6cf06dc3b1f 100644 --- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/ParticleCandidateList.cxx +++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/ParticleCandidateList.cxx @@ -12,7 +12,6 @@ // STL includes // Framework includes -#include "AthenaKernel/getMessageSvc.h" #include "GaudiKernel/GaudiException.h" // AnalysisUtils includes @@ -20,11 +19,11 @@ ParticleCandidateList::ParticleCandidateList() - : AthMessaging (Athena::getMessageSvc(), "ParticleCandidateList") + : AthMessaging ("ParticleCandidateList") {} ParticleCandidateList::ParticleCandidateList( const ParticleCandidateList& rhs) - : AthMessaging (Athena::getMessageSvc(), "ParticleCandidateList"), + : AthMessaging ("ParticleCandidateList"), m_list(rhs.m_list) {} diff --git a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/BTaggingValidationPlots.cxx b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/BTaggingValidationPlots.cxx index 81a99749e53..e28c7af00c8 100644 --- a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/BTaggingValidationPlots.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/BTaggingValidationPlots.cxx @@ -2,7 +2,6 @@ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ -#include "AthenaKernel/getMessageSvc.h" #include "BTaggingValidationPlots.h" #include "ParticleJetTools/JetFlavourInfo.h" #include "xAODBTagging/BTaggingUtilities.h" @@ -15,7 +14,7 @@ namespace JetTagDQA{ const std::string& sDir, std::string sParticleType) : PlotBase(pParent, sDir), - AthMessaging(Athena::getMessageSvc(), "BTaggingValidationPlots"), + AthMessaging("BTaggingValidationPlots"), m_sParticleType(std::move(sParticleType)), m_JVT_defined(false), m_JVTLargerEta_defined(false) diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TCCPlotsBase.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TCCPlotsBase.cxx index ae77abe87c1..5f129ee4ae9 100644 --- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TCCPlotsBase.cxx +++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/TCCPlotsBase.cxx @@ -10,7 +10,6 @@ #include "GaudiKernel/Service.h" #include "GaudiKernel/IToolSvc.h" -#include "AthenaKernel/getMessageSvc.h" // to retrieve HistogramDefinitionSvc #include "InDetPhysValMonitoring/HistogramDefinitionSvc.h" @@ -37,7 +36,7 @@ namespace { TCCPlotsBase::TCCPlotsBase(PlotBase* pParent, const std::string& folder): PlotBase(pParent, folder), - AthMessaging(Athena::getMessageSvc(), "TCCPlots"), + AthMessaging("TCCPlots"), m_folder(folder), m_histoDefSvc(nullptr) {} diff --git a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasMTRunManager.cxx b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasMTRunManager.cxx index fde01578327..656c8686afe 100644 --- a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasMTRunManager.cxx +++ b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasMTRunManager.cxx @@ -21,11 +21,10 @@ #include "GaudiKernel/ISvcLocator.h" #include "GaudiKernel/Bootstrap.h" -#include "AthenaKernel/getMessageSvc.h" G4AtlasMTRunManager::G4AtlasMTRunManager() : G4MTRunManager() - , AthMessaging(Athena::getMessageSvc(), "G4AtlasMTRunManager") + , AthMessaging("G4AtlasMTRunManager") , m_detGeoSvc("DetectorGeometrySvc", "G4AtlasMTRunManager") , m_physListSvc("PhysicsListSvc", "G4AtlasMTRunManager") , m_fastSimTool("FastSimulationMasterTool") diff --git a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasRunManager.cxx b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasRunManager.cxx index fd2bc9bc976..5ac05962741 100644 --- a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasRunManager.cxx +++ b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasRunManager.cxx @@ -4,7 +4,6 @@ #include "G4AtlasAlg/G4AtlasRunManager.h" -#include "AthenaKernel/getMessageSvc.h" #include "G4GeometryManager.hh" #include "G4LogicalVolumeStore.hh" @@ -22,7 +21,7 @@ G4AtlasRunManager::G4AtlasRunManager() : G4RunManager() - , AthMessaging(Athena::getMessageSvc(), "G4AtlasRunManager") + , AthMessaging("G4AtlasRunManager") , m_recordFlux(false) , m_fastSimTool("FastSimulationMasterTool") , m_physListSvc("PhysicsListSvc", "G4AtlasRunManager") diff --git a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasWorkerRunManager.cxx b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasWorkerRunManager.cxx index d092184eda6..7126ee071e1 100644 --- a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasWorkerRunManager.cxx +++ b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasWorkerRunManager.cxx @@ -23,7 +23,6 @@ #include "GaudiKernel/IMessageSvc.h" #include "GaudiKernel/GaudiException.h" -#include "AthenaKernel/getMessageSvc.h" #include @@ -31,7 +30,7 @@ static std::mutex workerInitMutex; G4AtlasWorkerRunManager::G4AtlasWorkerRunManager() : G4WorkerRunManager() - , AthMessaging(Athena::getMessageSvc(), "G4AtlasWorkerRunManager") + , AthMessaging("G4AtlasWorkerRunManager") // TODO: what if we need to make these configurable? , m_detGeoSvc("DetectorGeometrySvc", "G4AtlasWorkerRunManager") , m_fastSimTool("FastSimulationMasterTool") diff --git a/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx b/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx index c0a59523104..a823beb2278 100644 --- a/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx +++ b/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx @@ -14,7 +14,6 @@ #include "MCTruth/TrackHelper.h" #include "MCTruth/TrackInformation.h" #include "MCTruthBase/AtlasTrajectory.h" -#include "AthenaKernel/getMessageSvc.h" namespace G4UA { @@ -24,7 +23,7 @@ namespace G4UA //--------------------------------------------------------------------------- AthenaTrackingAction::AthenaTrackingAction(MSG::Level lvl, int secondarySavingLevel, int subDetVolLevel) - : AthMessaging(Athena::getMessageSvc(), "AthenaTrackingAction") + : AthMessaging("AthenaTrackingAction") , m_secondarySavingLevel(secondarySavingLevel) , m_subDetVolLevel(subDetVolLevel) { diff --git a/Simulation/G4Utilities/G4UserActions/src/G4SimTimer.cxx b/Simulation/G4Utilities/G4UserActions/src/G4SimTimer.cxx index 5161d0877cd..c9fb78a7cdb 100644 --- a/Simulation/G4Utilities/G4UserActions/src/G4SimTimer.cxx +++ b/Simulation/G4Utilities/G4UserActions/src/G4SimTimer.cxx @@ -6,7 +6,6 @@ #include "G4SimTimer.h" // Infrastructure includes -#include "AthenaKernel/getMessageSvc.h" namespace G4UA { @@ -34,7 +33,7 @@ namespace G4UA // G4SimTimer constructor //--------------------------------------------------------------------------- G4SimTimer::G4SimTimer() - : AthMessaging(Athena::getMessageSvc(), "G4SimTimer"), + : AthMessaging("G4SimTimer"), m_firstEvent(true) {} diff --git a/Simulation/G4Utilities/G4UserActions/src/MomentumConservation.cxx b/Simulation/G4Utilities/G4UserActions/src/MomentumConservation.cxx index 83ae60ad09e..cb5ea7274be 100644 --- a/Simulation/G4Utilities/G4UserActions/src/MomentumConservation.cxx +++ b/Simulation/G4Utilities/G4UserActions/src/MomentumConservation.cxx @@ -9,13 +9,12 @@ #include "G4PrimaryParticle.hh" #include -#include "AthenaKernel/getMessageSvc.h" namespace G4UA { MomentumConservation::MomentumConservation() - : AthMessaging(Athena::getMessageSvc(), "MomentumConservation"), + : AthMessaging("MomentumConservation"), _sum_edep(0), _sum_eesc(0) {} diff --git a/TileCalorimeter/TileDetDescr/src/TileCellDim.cxx b/TileCalorimeter/TileDetDescr/src/TileCellDim.cxx index b97a7919601..206f30afeef 100755 --- a/TileCalorimeter/TileDetDescr/src/TileCellDim.cxx +++ b/TileCalorimeter/TileDetDescr/src/TileCellDim.cxx @@ -10,14 +10,13 @@ #include "TileDetDescr/TileCellDim.h" -#include "AthenaKernel/getMessageSvc.h" // needed for 'Athena::getMessageSvc()' #include #include #include TileCellDim::TileCellDim(unsigned int nRows) : - AthMessaging (Athena::getMessageSvc(), "TileDetDescrManager"), + AthMessaging ("TileDetDescrManager"), m_nRows(nRows), m_volume(0) { diff --git a/TileCalorimeter/TileDetDescr/src/TileDddbManager.cxx b/TileCalorimeter/TileDetDescr/src/TileDddbManager.cxx index 27d5dc2ec35..1503539f2dd 100755 --- a/TileCalorimeter/TileDetDescr/src/TileDddbManager.cxx +++ b/TileCalorimeter/TileDetDescr/src/TileDddbManager.cxx @@ -16,7 +16,6 @@ #include "RDBAccessSvc/IRDBAccessSvc.h" #include "GaudiKernel/MsgStream.h" -#include "AthenaKernel/getMessageSvc.h" #include #include @@ -25,7 +24,7 @@ TileDddbManager::TileDddbManager(IRDBAccessSvc* access, const std::string& version_tag, const std::string& version_node, bool sqliteInput) - : AthMessaging (Athena::getMessageSvc(), "TileDddbManager") + : AthMessaging ("TileDddbManager") , m_n_cuts(0) , m_n_saddle(0) , m_currentTileGlob(0) diff --git a/TileCalorimeter/TileRecUtils/src/TileCorrelation.cxx b/TileCalorimeter/TileRecUtils/src/TileCorrelation.cxx index 19216632e48..c9ec855247f 100644 --- a/TileCalorimeter/TileRecUtils/src/TileCorrelation.cxx +++ b/TileCalorimeter/TileRecUtils/src/TileCorrelation.cxx @@ -35,7 +35,7 @@ //////////////////////////////////////// TileCorrelation::TileCorrelation() - : AthMessaging (Athena::getMessageSvc(), "TileCorrelation") + : AthMessaging ("TileCorrelation") , m_SS() , m_S() , m_R() diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx index 4fd4475c122..a00dd1aee5e 100644 --- a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx +++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx @@ -22,7 +22,7 @@ TileROD_Encoder::TileROD_Encoder(): - AthMessaging (Athena::getMessageSvc(), "TileROD_Encoder"), + AthMessaging ("TileROD_Encoder"), m_tileHWID(0), m_verbose(false), m_type(0), diff --git a/Trigger/EFTracking/EFTrackingSim/TrigHTTBanks/src/HTTFitConstantBank.cxx b/Trigger/EFTracking/EFTrackingSim/TrigHTTBanks/src/HTTFitConstantBank.cxx index d15a63e7dff..dd3a66b7957 100644 --- a/Trigger/EFTracking/EFTrackingSim/TrigHTTBanks/src/HTTFitConstantBank.cxx +++ b/Trigger/EFTracking/EFTrackingSim/TrigHTTBanks/src/HTTFitConstantBank.cxx @@ -4,7 +4,6 @@ #include "TrigHTTBanks/HTTFitConstantBank.h" #include "TrigHTTObjects/HTTTrack.h" #include "TrigHTTObjects/HTTConstants.h" -#include "AthenaKernel/getMessageSvc.h" #include "limits.h" #include #include @@ -21,7 +20,7 @@ #include HTTFitConstantBank::HTTFitConstantBank(HTTPlaneMap const * pmap, int ncoords, std::string const & fname, bool isFirstStage, int missingPlane) : - AthMessaging (Athena::getMessageSvc(), "HTTFitConstantBank"), + AthMessaging ("HTTFitConstantBank"), m_pmap(pmap), m_bankID(0), m_nsectors(0), diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx index 66d2b5b77c0..012c7ec14a5 100644 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx @@ -12,7 +12,6 @@ #include "TrigSteeringEvent/TrigRoiDescriptor.h" #include "CaloEvent/CaloConstCellContainer.h" #include "AthenaBaseComps/AthMessaging.h" -#include "AthenaKernel/getMessageSvc.h" #include "TestCaloDataAccess.h" #include @@ -33,7 +32,7 @@ public: AskForRoI( const EventContext& context, const ServiceHandle& svc, const TrigRoiDescriptor& roi ) - : AthMessaging (Athena::getMessageSvc(), "TestCaloDataAccess"), + : AthMessaging ("TestCaloDataAccess"), m_context( context ), m_svc( svc ), m_roi ( roi ) { diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPhos4Shape.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPhos4Shape.cxx index 267fb642b61..29760e5dc2f 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPhos4Shape.cxx +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPhos4Shape.cxx @@ -12,11 +12,10 @@ // // ********************************************************* -#include "AthenaKernel/getMessageSvc.h" #include "TrigT1CaloCalibTools/L1CaloPprPhos4Shape.h" L1CaloPprPhos4Shape::L1CaloPprPhos4Shape(const L1CaloCoolChannelId& coolId) : - AthMessaging(Athena::getMessageSvc(), "L1CaloPprPhos4Shape") + AthMessaging("L1CaloPprPhos4Shape") { m_coolId = coolId; m_eta = 999.; diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPhos4ShapeCollection.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPhos4ShapeCollection.cxx index af37e30e124..0a17f155a59 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPhos4ShapeCollection.cxx +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPhos4ShapeCollection.cxx @@ -6,7 +6,6 @@ #include "TrigT1CaloCalibConditions/ChanCalibErrorCode.h" #include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h" -#include "AthenaKernel/getMessageSvc.h" #include #include @@ -28,7 +27,7 @@ L1CaloPprPhos4ShapeCollection::L1CaloPprPhos4ShapeCollection(): - AthMessaging(Athena::getMessageSvc(), "L1CaloPprPhos4ShapeCollection"), + AthMessaging("L1CaloPprPhos4ShapeCollection"), m_minSignalHeight(30), m_timingRegime("Calib1"), m_histTool(0) diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx index dd760cc1c48..7b5da764d84 100644 --- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx +++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx @@ -45,7 +45,7 @@ L1CaloPprPlotManager::L1CaloPprPlotManager(ITHistSvc* histSvc, const std::string& monitoringTitle, const std::string& monitoringDimension, bool doRunHistograms): - AthMessaging(Athena::getMessageSvc(), Form("L1CaloPpr%sPlotManager", monitoringPath.data())), + AthMessaging(Form("L1CaloPpr%sPlotManager", monitoringPath.data())), m_histTool("LVL1::TrigT1CaloLWHistogramTool/TrigT1CaloLWHistogramTool"), m_ttToolOffline(ttTool_offline), m_eventInfo(0), @@ -97,7 +97,7 @@ L1CaloPprPlotManager::L1CaloPprPlotManager(ManagedMonitorToolBase* aMonObj, const std::string& monitoringName, const std::string& monitoringTitle, const std::string& monitoringDimension): - AthMessaging(Athena::getMessageSvc(), Form("L1CaloPpr%sPlotManager", monitoringPath.data())), + AthMessaging(Form("L1CaloPpr%sPlotManager", monitoringPath.data())), m_histTool("LVL1::TrigT1CaloLWHistogramTool/TrigT1CaloLWHistogramTool"), m_ttToolOnline(ttTool_online), m_eventInfo(0), diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCBIS78CoincidenceMap.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCBIS78CoincidenceMap.cxx index e589b806e76..0dff8ad346a 100644 --- a/Trigger/TrigT1/TrigT1TGC/src/TGCBIS78CoincidenceMap.cxx +++ b/Trigger/TrigT1/TrigT1TGC/src/TGCBIS78CoincidenceMap.cxx @@ -9,7 +9,6 @@ #include #include -#include "AthenaKernel/getMessageSvc.h" #include "TrigT1TGC/TGCBIS78CoincidenceMap.h" #include "TrigT1TGC/BIS78TrigOut.h" #include "TrigT1TGC/TGCDatabaseManager.h" @@ -21,7 +20,7 @@ namespace LVL1TGCTrigger { TGCBIS78CoincidenceMap::TGCBIS78CoincidenceMap(TGCArguments* tgcargs,const std::string& version) - :AthMessaging(Athena::getMessageSvc(), "TGCBIS78CoincidenceMap"), + :AthMessaging("TGCBIS78CoincidenceMap"), m_verName(version), m_condDbTool("TGCTriggerDbTool"), m_tgcArgs(tgcargs) diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx index a6139ba01ea..856c30fc805 100644 --- a/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx +++ b/Trigger/TrigT1/TrigT1TGC/src/TGCDatabaseManager.cxx @@ -73,7 +73,7 @@ void TGCDatabaseManager::addConnectionInPP(const TGCPatchPanel* patchPanel, } TGCDatabaseManager::TGCDatabaseManager() - : AthMessaging(Athena::getMessageSvc(), "LVL1TGC::TGCDatabaseManager"), + : AthMessaging("LVL1TGC::TGCDatabaseManager"), m_tgcArgs(nullptr) { for(int j=0; j& readCondKey, const SG::ReadCondHandleKey& readLUTsCondKey) - : AthMessaging(Athena::getMessageSvc(), "LVL1TGC::TGCDatabaseManager"), + : AthMessaging("LVL1TGC::TGCDatabaseManager"), m_tgcArgs(tgcargs) { setLevel(tgcArgs()->MSGLEVEL()); @@ -191,7 +191,7 @@ TGCDatabaseManager::~TGCDatabaseManager() } TGCDatabaseManager::TGCDatabaseManager(const TGCDatabaseManager& right) - : AthMessaging(Athena::getMessageSvc(), "LVL1TGC::TGCDatabaseManager") + : AthMessaging("LVL1TGC::TGCDatabaseManager") { for(int j=0; j& readCondKey) - :AthMessaging(Athena::getMessageSvc(), "LVL1TGC::TGCEIFICoincidenceMap"), + :AthMessaging("LVL1TGC::TGCEIFICoincidenceMap"), m_verName("NA"), m_side(0), m_fullCW(false), @@ -50,7 +49,7 @@ TGCEIFICoincidenceMap::TGCEIFICoincidenceMap(TGCArguments* tgcargs, const SG::ReadCondHandleKey& readCondKey, const std::string& version, int sideID) - : AthMessaging(Athena::getMessageSvc(), "LVL1TGC::TGCEIFICoincidenceMap"), + : AthMessaging("LVL1TGC::TGCEIFICoincidenceMap"), m_verName(version), m_side(sideID), m_fullCW(false), @@ -103,7 +102,7 @@ TGCEIFICoincidenceMap::TGCEIFICoincidenceMap(TGCArguments* tgcargs, TGCEIFICoincidenceMap::TGCEIFICoincidenceMap(const TGCEIFICoincidenceMap& right) - : AthMessaging(Athena::getMessageSvc(), "LVL1TGC::TGCEIFICoincidenceMap"), + : AthMessaging("LVL1TGC::TGCEIFICoincidenceMap"), m_readCondKey(right.m_readCondKey) { ATH_MSG_DEBUG("copy constructor"); diff --git a/Trigger/TrigT1/TrigT1TGC/src/TGCNSWCoincidenceMap.cxx b/Trigger/TrigT1/TrigT1TGC/src/TGCNSWCoincidenceMap.cxx index 01b839d17af..37194381f99 100644 --- a/Trigger/TrigT1/TrigT1TGC/src/TGCNSWCoincidenceMap.cxx +++ b/Trigger/TrigT1/TrigT1TGC/src/TGCNSWCoincidenceMap.cxx @@ -9,7 +9,6 @@ #include #include -#include "AthenaKernel/getMessageSvc.h" #include "TrigT1TGC/TGCNSWCoincidenceMap.h" #include "TrigT1TGC/NSWTrigOut.h" #include "TrigT1TGC/TGCDatabaseManager.h" @@ -23,7 +22,7 @@ namespace LVL1TGCTrigger { TGCNSWCoincidenceMap::TGCNSWCoincidenceMap(TGCArguments* tgcargs,const std::string& version,int side,int oct,int mod) - :AthMessaging(Athena::getMessageSvc(), "TGCNSWCoincidenceMap"), + :AthMessaging("TGCNSWCoincidenceMap"), m_verName(version), m_side(side), m_octant(oct), -- GitLab