From 8b9f5b51f34a53474617e04bf0d5800f788ce4b4 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 24 Nov 2022 16:17:40 +0100
Subject: [PATCH] ALFA_Digitization: Fix cppcheck warnings.
ALFA_Digitization: Fix cppcheck warnings.
Prefer to initialize data members in an initialization list.
Redundant string conversion.
Prefer preincrement to postincrement for class instances.
---
.../ALFA_Digitization/src/ALFA_PileUpTool.cxx | 32 ++++++++-----------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/src/ALFA_PileUpTool.cxx b/ForwardDetectors/ALFA/ALFA_Digitization/src/ALFA_PileUpTool.cxx
index 7a9e1fa8ccb..1d65790f6f5 100644
--- a/ForwardDetectors/ALFA/ALFA_Digitization/src/ALFA_PileUpTool.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/src/ALFA_PileUpTool.cxx
@@ -50,28 +50,22 @@ ALFA_PileUpTool::ALFA_PileUpTool(const std::string& type,
const std::string& name,
const IInterface* parent) :
PileUpToolBase(type, name, parent),
+ m_SimHitCollectionName ("ALFA_HitCollection"),
+ m_SimODHitCollectionName ("ALFA_ODHitCollection"),
+ m_key_DigitCollection ("ALFA_DigitCollection"),
+ m_key_ODDigitCollection ("ALFA_ODDigitCollection"),
+ m_digitCollection (nullptr),
+ m_ODdigitCollection (nullptr),
m_sigma0 (0.1),
m_sigma1 (1.0),
m_meanE_dep (0.0863), //MeV
m_meanN_photo (4.11),
m_mean (0.0),
m_stdDev (1.0),
- m_AmplitudeCut (0.24)
-// m_fillRootTree (false)
+ m_AmplitudeCut (0.24),
+ m_mergedALFA_HitList (nullptr),
+ m_mergedALFA_ODHitList (nullptr)
{
-
- m_SimHitCollectionName = "ALFA_HitCollection";
- m_SimODHitCollectionName = "ALFA_ODHitCollection";
-
- m_digitCollection = nullptr; // initializing to null pointer
- m_ODdigitCollection = nullptr; // initializing to null pointer
-
- m_mergedALFA_HitList = nullptr;
- m_mergedALFA_ODHitList = nullptr;
-
- m_key_DigitCollection = "ALFA_DigitCollection";
- m_key_ODDigitCollection = "ALFA_ODDigitCollection";
-
// Properties
declareProperty("SimHitCollection", m_SimHitCollectionName, "Name of the input ALFA Sim Hit Collection of simulated hits");
declareProperty("SimODHitCollection", m_SimODHitCollectionName, "Name of the input ALFA Sim OD Hit Collection of simulated hits");
@@ -251,7 +245,7 @@ StatusCode ALFA_PileUpTool::processBunchXing(int bunchXing,
SubEventIterator eSubEvents) {
ATH_MSG_DEBUG ( "ALFA_PileUpTool::processBunchXing() " << bunchXing );
SubEventIterator iEvt = bSubEvents;
- for (; iEvt!=eSubEvents; iEvt++) {
+ for (; iEvt!=eSubEvents; ++iEvt) {
StoreGateSvc& seStore = *iEvt->ptr()->evtStore();
//PileUpTimeEventIndex thisEventIndex = PileUpTimeEventIndex(static_cast<int>(iEvt->time()),iEvt->index()); not used
ATH_MSG_VERBOSE("SubEvt StoreGate " << seStore.name() << " :"
@@ -429,7 +423,7 @@ void ALFA_PileUpTool::ALFA_MD_info(const ALFA_HitCollection* ALFA_HitCollection)
ALFA_HitConstIter it = ALFA_HitCollection->begin();
ALFA_HitConstIter itend = ALFA_HitCollection->end();
- for (; it != itend; it++) {
+ for (; it != itend; ++it) {
station = it->GetStationNumber();
plate = it->GetPlateNumber();
@@ -518,7 +512,7 @@ void ALFA_PileUpTool::ALFA_OD_info(const ALFA_ODHitCollection* ALFA_ODHitCollect
ALFA_ODHitConstIter it = ALFA_ODHitCollection->begin();
ALFA_ODHitConstIter itend = ALFA_ODHitCollection->end();
- for (; it != itend; it++) {
+ for (; it != itend; ++it) {
station = it->GetStationNumber();
@@ -691,7 +685,7 @@ StatusCode ALFA_PileUpTool::fill_OD_DigitCollection(CLHEP::HepRandomEngine* rndE
ATH_MSG_DEBUG("file name " << m_filename.c_str() );
- std::string filePath = PathResolver::find_file(m_filename.c_str(),"DATAPATH", PathResolver::RecursiveSearch);
+ std::string filePath = PathResolver::find_file(m_filename,"DATAPATH", PathResolver::RecursiveSearch);
if(filePath.length() == 0)
{
--
GitLab