From 791287834fa8c9e572b7e465e54772bd619e5da3 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Thu, 7 Nov 2019 00:04:05 +0100 Subject: [PATCH] LArMonitoring: Fix compilation with clang. Fix clang compilation errors stemming from Gaudi property ambiguities. Also fix unused private member warning. --- .../src/LArAffectedRegionsAlg.cxx | 48 +++++++++---------- .../LArMonitoring/src/LArDigitMonAlg.h | 1 - 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.cxx b/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.cxx index 6c069bc71e46..080a83df3343 100644 --- a/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.cxx +++ b/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.cxx @@ -130,12 +130,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<phimax){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_embpsName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_embpsName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMBAPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_embpsName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_embpsName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMBCPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/32); @@ -147,12 +147,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<TMath::Pi()){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_embpsName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_embpsName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMBAPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_embpsName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_embpsName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMBCPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/32); @@ -162,12 +162,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<phimax){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_embpsName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_embpsName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMBAPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_embpsName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_embpsName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMBCPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/32); @@ -189,12 +189,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<phimax){ if(eta >=0){ etaPOS=eta; - fill(m_MonGroupName+m_embName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_embName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMBA " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta <0){ etaNEG=eta; - fill(m_MonGroupName+m_embName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_embName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMBC " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/128); @@ -206,12 +206,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<TMath::Pi()){ if(eta >=0){ etaPOS=eta; - fill(m_MonGroupName+m_embName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_embName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMBA " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta <0){ etaNEG=eta; - fill(m_MonGroupName+m_embName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_embName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMBC " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/128); @@ -221,12 +221,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<phimax){ if(eta >=0){ etaPOS=eta; - fill(m_MonGroupName+m_embName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_embName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMBA " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta <0){ etaNEG=eta; - fill(m_MonGroupName+m_embName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_embName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMBC " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/128); @@ -248,12 +248,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<phimax){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_emecpsName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_emecpsName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMECAPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_emecpsName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_emecpsName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMECCPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/64); @@ -265,12 +265,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<TMath::Pi()){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_emecpsName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_emecpsName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMECAPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_emecpsName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_emecpsName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMECCPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/64); @@ -280,12 +280,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<phimax){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_emecpsName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_emecpsName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMECAPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_emecpsName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_emecpsName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMECCPS " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/64); @@ -308,12 +308,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<phimax){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_emecName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_emecName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMECA " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_emecName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_emecName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMECC " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/256); @@ -325,12 +325,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<TMath::Pi()){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_emecName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_emecName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMECA " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_emecName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_emecName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMECC " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/256); @@ -340,12 +340,12 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const while(phi<phimax){ if(eta>=0){ etaPOS=eta; - fill(m_MonGroupName+m_emecName,etaPOS,phi,problem); + fill(std::string(m_MonGroupName)+m_emecName,etaPOS,phi,problem); ATH_MSG_DEBUG( "EMECA " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } if(eta<0){ etaNEG=eta; - fill(m_MonGroupName+m_emecName,etaNEG,phi,problem); + fill(std::string(m_MonGroupName)+m_emecName,etaNEG,phi,problem); ATH_MSG_DEBUG( "EMECC " << eta << " " << phi << " " << problem << " " << layermin << " " << layermax << " " << region ); } phi+=(2*TMath::Pi()/256); diff --git a/LArCalorimeter/LArMonitoring/src/LArDigitMonAlg.h b/LArCalorimeter/LArMonitoring/src/LArDigitMonAlg.h index c23c685a13a1..7088f9c899ea 100755 --- a/LArCalorimeter/LArMonitoring/src/LArDigitMonAlg.h +++ b/LArCalorimeter/LArMonitoring/src/LArDigitMonAlg.h @@ -64,7 +64,6 @@ private: Gaudi::Property<int> m_NumberBadFebs {this, "NumberBadFebs", 5}; /**bool use to mask the bad channels*/ Gaudi::Property<bool> m_ignoreKnownBadChannels{this, "IgnoreBadChannels", false}; - bool m_PercComputed; /** Switch to online/offline mode*/ Gaudi::Property<bool> m_IsOnline {this, "IsOnline", false}; /** Treshold to declare a bad event*/ -- GitLab