From 4b679a69ebe2bc21530ad6551159d8da61c0b629 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Tue, 20 Jul 2021 19:12:18 +0200
Subject: [PATCH] AFP_Monitoring cppcheck and clang-tidy related fixes
---
.../AFP/AFP_Monitoring/AFP_Monitoring/AFPHitsMonitorTool.h | 2 +-
.../AFP_Monitoring/AFPSiLayerSummaryProfileBase.h | 2 +-
.../AFP_Monitoring/AFPTechnicalLayerMonitor.h | 6 +++---
.../AFP_Monitoring/AFP_Monitoring/AFPTechnicalMonitorTool.h | 6 +++---
.../AFP_Monitoring/AFPTechnicalStationMonitor.h | 4 ++--
.../AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx | 6 +++---
.../AFP/AFP_Monitoring/src/AFPSiLayerSummaryProfileBase.cxx | 2 +-
.../AFP/AFP_Monitoring/src/AFPSiStationMonitor.cxx | 2 +-
.../AFP/AFP_Monitoring/src/AFPTechnicalLayerMonitor.cxx | 6 +++---
.../AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx | 4 ++--
.../AFP/AFP_Monitoring/src/AFPTechnicalStationMonitor.cxx | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPHitsMonitorTool.h b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPHitsMonitorTool.h
index 698b46eb5f86..e49a7c51b181 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPHitsMonitorTool.h
+++ b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPHitsMonitorTool.h
@@ -114,7 +114,7 @@ protected:
/// stations and layers monitors and creates a TProfile with bins
/// for each layer. On Y axis mean value of o given histogram is
/// inserted.
- void makeLayerSummaryHist (const std::string inputHistName, const std::string outputHistName, const std::string outputHistTitle);
+ void makeLayerSummaryHist (const std::string& inputHistName, const std::string& outputHistName, const std::string& outputHistTitle);
private:
SG::ReadHandleKey<xAOD::AFPSiHitContainer> m_afpHitContainerKey
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPSiLayerSummaryProfileBase.h b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPSiLayerSummaryProfileBase.h
index baf61929074c..eb59ed4aadcd 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPSiLayerSummaryProfileBase.h
+++ b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPSiLayerSummaryProfileBase.h
@@ -20,7 +20,7 @@ class AFPSiLayerSummaryProfileBase
{
public:
/// Creates a TPofile object #m_profile and sets bin labels according to monitors in #m_parentTool.
- AFPSiLayerSummaryProfileBase (AFPHitsMonitorTool* parentTool, const ManagedMonitorToolBase::MonGroup& monGrp, const std::string name, const std::string title);
+ AFPSiLayerSummaryProfileBase (AFPHitsMonitorTool* parentTool, const ManagedMonitorToolBase::MonGroup& monGrp, const std::string& name, const std::string& title);
/// Does nothing. The ownership of the #m_profile object is taken by monitoring service.
virtual ~AFPSiLayerSummaryProfileBase() {}
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalLayerMonitor.h b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalLayerMonitor.h
index 6228cb23d91f..bf10e9ad4946 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalLayerMonitor.h
+++ b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalLayerMonitor.h
@@ -28,7 +28,7 @@ public:
///
/// @param toolToStoreHistograms pointer to the main monitoring object in which distributions should be bookd
/// @param histsDirName additional string used to form path in ROOT file where distributions should be saved
- void bookHistograms(ManagedMonitorToolBase* toolToStoreHistograms, std::string histsDirName = "");
+ void bookHistograms(ManagedMonitorToolBase* toolToStoreHistograms, const std::string& histsDirName = "");
/// Fills distributions with information provided by the hit.
void fillHistograms(const AFP_SiRawData& hit);
@@ -43,10 +43,10 @@ public:
protected:
/// Creates a name suffixed with station and layer numbers.
- std::string makeHistName (const std::string name) const;
+ std::string makeHistName (const std::string& name) const;
/// Creates a title suffixed with station and layer numbers.
- std::string makeHistTitle (const std::string title) const;
+ std::string makeHistTitle (const std::string& title) const;
/// ID number of the monitored pixel layer.
const int m_pixelLayerID;
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalMonitorTool.h b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalMonitorTool.h
index c024736aaf5b..9b538fab8209 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalMonitorTool.h
+++ b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalMonitorTool.h
@@ -60,9 +60,9 @@ protected:
std::vector<AFPTechnicalStationMonitor*> m_stationsMonitors;
// histograms
- LWHist1D* m_bcIDAfp; ///< distribution of bcID sent by AFP
- LWHist1D* m_bcIDATLAS; ///< distribution of bcID sent by ATLAS
- LWHist1D* m_bcIDDiffAfpAtlas; ///< distribution of difference between ATLAS and AFP bcID
+ LWHist1D* m_bcIDAfp = nullptr; ///< distribution of bcID sent by AFP
+ LWHist1D* m_bcIDATLAS = nullptr; ///< distribution of bcID sent by ATLAS
+ LWHist1D* m_bcIDDiffAfpAtlas = nullptr; ///< distribution of difference between ATLAS and AFP bcID
};
#endif
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalStationMonitor.h b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalStationMonitor.h
index b330e1876f65..c7029c742377 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalStationMonitor.h
+++ b/ForwardDetectors/AFP/AFP_Monitoring/AFP_Monitoring/AFPTechnicalStationMonitor.h
@@ -51,12 +51,12 @@ protected:
/// @brief Create a string with station number. Used for creating names of distributions.
///
/// @param name text which should be prepended to the standard one e.g. "Station1"
- std::string makeName (const std::string name) const;
+ std::string makeName (const std::string& name) const;
/// @brief Create a string with station number. Used for creating titles of distributions.
///
/// @param title text which should be prepended to the standard one e.g. " in station 1"
- std::string makeTitle (const std::string title) const;
+ std::string makeTitle (const std::string& title) const;
/// ID number of the first layer
static const int s_firstLayerIndex;
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx
index 184373cd96ea..bfe102b6713c 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx
@@ -41,7 +41,7 @@ AFPHitsMonitorTool::
StatusCode AFPHitsMonitorTool::initialize()
{
- if (m_stationsMonitors.size() != 0) {
+ if (!m_stationsMonitors.empty()) {
// loop over tools
for (ToolHandle<IAFPSiStationMonitor>& stationMon : m_stationsMonitors) {
if (stationMon.retrieve().isFailure())
@@ -115,7 +115,7 @@ StatusCode AFPHitsMonitorTool::fillHistograms()
break;
}
- if (matchStation == false)
+ if (!matchStation)
ATH_MSG_WARNING("Unrecognised station index: "<<hit->stationID());
}
@@ -127,7 +127,7 @@ StatusCode AFPHitsMonitorTool::fillHistograms()
}
-void AFPHitsMonitorTool::makeLayerSummaryHist (const std::string inputHistName, const std::string outputHistName, const std::string outputHistTitle)
+void AFPHitsMonitorTool::makeLayerSummaryHist (const std::string& inputHistName, const std::string& outputHistName, const std::string& outputHistTitle)
{
ManagedMonitorToolBase::MonGroup managedBookingLumiBlock(this, histsDirectoryName(), lumiBlock, ManagedMonitorToolBase::ATTRIB_MANAGED); // to re-booked every luminosity block
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPSiLayerSummaryProfileBase.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPSiLayerSummaryProfileBase.cxx
index 86ead4a4c0c1..fa4ed375589c 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPSiLayerSummaryProfileBase.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPSiLayerSummaryProfileBase.cxx
@@ -8,7 +8,7 @@
#include "AFP_Monitoring/IAFPSiLayerMonitor.h"
#include "AFP_Monitoring/AFPHitsMonitorTool.h"
-AFPSiLayerSummaryProfileBase::AFPSiLayerSummaryProfileBase (AFPHitsMonitorTool* parentTool, const ManagedMonitorToolBase::MonGroup& monGrp, const std::string name, const std::string title) : m_parentTool(parentTool), m_monGrp (monGrp)
+AFPSiLayerSummaryProfileBase::AFPSiLayerSummaryProfileBase (AFPHitsMonitorTool* parentTool, const ManagedMonitorToolBase::MonGroup& monGrp, const std::string& name, const std::string& title) : m_parentTool(parentTool), m_monGrp (monGrp)
{
// count number of layers in monitor
int totalPlanes = 0;
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPSiStationMonitor.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPSiStationMonitor.cxx
index 209dc7e42eba..6e71b610f4dc 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPSiStationMonitor.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPSiStationMonitor.cxx
@@ -21,7 +21,7 @@ AFPSiStationMonitor::AFPSiStationMonitor(const std::string& type,
StatusCode AFPSiStationMonitor::initialize()
{
- if (m_layersMonitors.size() != 0) {
+ if (!m_layersMonitors.empty()) {
// loop over tools
for (ToolHandle<IAFPSiLayerMonitor>& layerMon : m_layersMonitors) {
// retrieve tools
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalLayerMonitor.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalLayerMonitor.cxx
index 0ac0d748f531..9a7ede36f202 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalLayerMonitor.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalLayerMonitor.cxx
@@ -23,7 +23,7 @@ AFPTechnicalLayerMonitor::~AFPTechnicalLayerMonitor()
}
// Description: Used for re-booking managed histograms
-void AFPTechnicalLayerMonitor::bookHistograms(ManagedMonitorToolBase* toolToStoreHistograms, const std::string histsDirName)
+void AFPTechnicalLayerMonitor::bookHistograms(ManagedMonitorToolBase* toolToStoreHistograms, const std::string& histsDirName)
{
// ********** Per lumi block **********
@@ -49,7 +49,7 @@ void AFPTechnicalLayerMonitor::endOfLumiBlock(ManagedMonitorToolBase* /* toolToS
}
-std::string AFPTechnicalLayerMonitor::makeHistName (const std::string name) const
+std::string AFPTechnicalLayerMonitor::makeHistName (const std::string& name) const
{
std::stringstream histName;
histName<<name<<"St"<<m_stationID<<"Layer"<<m_pixelLayerID;
@@ -58,7 +58,7 @@ std::string AFPTechnicalLayerMonitor::makeHistName (const std::string name) cons
}
-std::string AFPTechnicalLayerMonitor::makeHistTitle (const std::string title) const
+std::string AFPTechnicalLayerMonitor::makeHistTitle (const std::string& title) const
{
std::stringstream histTitle;
histTitle<<title<<" in station "<<m_stationID<<" for layer "<<m_pixelLayerID;
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx
index 969634720164..88090141878f 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx
@@ -85,14 +85,14 @@ StatusCode AFPTechnicalMonitorTool::bookHistograms( )
StatusCode AFPTechnicalMonitorTool::fillHistograms()
{
// read information
- const xAOD::EventInfo* eventInfo = 0;
+ const xAOD::EventInfo* eventInfo = nullptr;
CHECK( evtStore()->retrieve( eventInfo) );
// create and register histogram only if Raw data is processed
if(m_environment == AthenaMonManager::online || m_environment == AthenaMonManager::tier0Raw) {
// read information
- const AFP_RawContainer* afpContainer = 0;
+ const AFP_RawContainer* afpContainer = nullptr;
CHECK(evtStore()->retrieve(afpContainer));
for (const AFP_SiRawCollection& hitCollection : afpContainer->collectionsSi()) {
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalStationMonitor.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalStationMonitor.cxx
index 5734f9135f7e..b093982fbe6f 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalStationMonitor.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalStationMonitor.cxx
@@ -90,7 +90,7 @@ void AFPTechnicalStationMonitor::endOfLumiBlock(AFPTechnicalMonitorTool* toolToS
layer->endOfLumiBlock(toolToStoreHistograms);
}
-std::string AFPTechnicalStationMonitor::makeName (const std::string name) const
+std::string AFPTechnicalStationMonitor::makeName (const std::string& name) const
{
std::stringstream histName;
histName <<name<<"Station"<<m_stationID;
@@ -98,7 +98,7 @@ std::string AFPTechnicalStationMonitor::makeName (const std::string name) const
return histName.str();
}
-std::string AFPTechnicalStationMonitor::makeTitle (const std::string title) const
+std::string AFPTechnicalStationMonitor::makeTitle (const std::string& title) const
{
std::stringstream histTitle;
histTitle <<title<<" in station "<<m_stationID;
--
GitLab