From b1a19e52b597098fc86b3dc5d2c4f1271d913116 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Fri, 18 Oct 2019 03:50:17 +0200 Subject: [PATCH 1/2] MuonReadoutGeometry: Remove msgSvc arg from ctor. Remove unused msgSvc argument from the TgcReadoutParams constructor. --- .../MuonReadoutGeometry/TgcReadoutParams.h | 6 +++--- .../MuonReadoutGeometry/src/TgcReadoutParams.cxx | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h index 184517ef7b9..9d3f3ad5b9b 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/TgcReadoutParams.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ // ****************************************************************************** @@ -51,13 +51,13 @@ public: TgcReadoutParams(std::string name, int iCh, int Version, float WireSp, const float NCHRNG, const float* NWGS, const float* IWGS1, const float* IWGS2, const float* IWGS3, - const float* ROFFST, const float* NSPS, const float* POFFST, IMessageSvc* msgSvc); + const float* ROFFST, const float* NSPS, const float* POFFST); // Another constructor for the layout Q TgcReadoutParams(std::string name, int iCh, int Version, float WireSp, const int NCHRNG, const float* NWGS, const float* IWGS1, const float* IWGS2, const float* IWGS3, float PDIST, const float* SLARGE, const float* SSHORT, - const float* ROFFST, const float* NSPS, const float* POFFST, IMessageSvc* msgSvc); + const float* ROFFST, const float* NSPS, const float* POFFST); ~TgcReadoutParams(); diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutParams.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutParams.cxx index 0eec832f4c5..1af266dee0d 100644 --- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutParams.cxx +++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/TgcReadoutParams.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ // ****************************************************************************** @@ -25,7 +25,7 @@ namespace MuonGM { TgcReadoutParams::TgcReadoutParams(std::string name, int iCh, int Version, float WireSp, const float NCHRNG, const float* NWGS, const float* IWGS1, const float* IWGS2, const float* IWGS3, const float* ROFFST, const float* NSPS, - const float* POFFST, IMessageSvc* msgSvc ) + const float* POFFST) :m_chamberName(name), m_chamberType(iCh), m_readoutVersion(Version), m_wirePitch(WireSp), m_nPhiChambers((int)NCHRNG), m_physicalDistanceFromBase(-9999.) { @@ -60,14 +60,13 @@ TgcReadoutParams::TgcReadoutParams(std::string name, int iCh, int Version, float StatusCode sc = svcLocator->service("MessageSvc", m_msgSvc); if (sc.isFailure()) std::cout << "Fail to locate Message Service" << std::endl; m_Log = std::make_unique(m_msgSvc, "TgcReadoutParams"); - if (msgSvc) (*m_Log) << MSG::WARNING<<"TgcReadoutParams::TgcReadoutParams() - passed IMessageSvc which is not needed anymore." << endmsg; } TgcReadoutParams::TgcReadoutParams(std::string name, int iCh, int Version, float WireSp, const int NCHRNG, const float* NWGS, const float* IWGS1, const float* IWGS2, const float* IWGS3, float PDIST, const float* SLARGE, const float* SSHORT, - const float* ROFFST, const float* NSPS, const float* POFFST, IMessageSvc* msgSvc) + const float* ROFFST, const float* NSPS, const float* POFFST) : m_chamberName(name), m_chamberType(iCh), m_readoutVersion(Version), m_wirePitch(WireSp), m_nPhiChambers(NCHRNG) { @@ -111,7 +110,6 @@ TgcReadoutParams::TgcReadoutParams(std::string name, int iCh, int Version, float StatusCode sc = svcLocator->service("MessageSvc", m_msgSvc); if (sc.isFailure()) std::cout << "Fail to locate Message Service" << std::endl; m_Log = std::make_unique(m_msgSvc, "TgcReadoutParams"); - if (msgSvc) (*m_Log) << MSG::WARNING<<"TgcReadoutParams::TgcReadoutParams() - passed IMessageSvc which is not needed anymore." << endmsg; } -- GitLab From 539f824171099aac75cab04c1cd9107ff6b55d08 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Fri, 18 Oct 2019 03:52:10 +0200 Subject: [PATCH 2/2] MuonGeoModel: Remove msgSvc arg from ctor. Remove unused msgSvc argument from the TgcReadoutParams constructor. --- MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx b/MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx index cf2325b57b1..32d454d5189 100755 --- a/MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx +++ b/MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ @@ -480,7 +480,7 @@ void RDBReaderAtlas::ProcessTGCreadout () { &iwgs3[0], &roffst[0], &nsps[0], - &poffst[0], m_mgr->msgSvc()); + &poffst[0]); MYSQL::GetPointer()->StoreTgcRPars(rpar); m_mgr->storeTgcReadoutParams(rpar); @@ -596,7 +596,7 @@ void RDBReaderAtlas::ProcessTGCreadout () { &sshort[0], &roffst[0], &nsps[0], - &poffst[0], m_mgr->msgSvc()); + &poffst[0]); MYSQL::GetPointer()->StoreTgcRPars(rpar); m_mgr->storeTgcReadoutParams(rpar); -- GitLab