Skip to content
Snippets Groups Projects
Commit 0cb667f5 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'cppcheck.VP1UtilsBase-20210819' into 'master'

VP1UtilsBase: Fix cppcheck warnings.

See merge request !45943
parents 19903ca2 3954c2a8
No related branches found
No related tags found
11 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!50012RecExConfig: Adjust log message levels from GetRunNumber and GetLBNumber,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!46538Draft: Added missing xAOD::TrigConfKeys from DESDM_MCP,!46514TGC Digitization: Implementation of signal propagation time between the sensor edge and ASD,!46389URGENT : egamma monitoring tag for reprocessing,!46095Draft: fix TrackingGeometry reordering bugs in serial athena,!45943VP1UtilsBase: Fix cppcheck warnings.
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
......@@ -30,7 +30,7 @@ public:
std::string getRandomConfigFile();
static void overlayATLASlogo();
static void overlayEventDetails(unsigned long runNumber, unsigned long eventNumber, std::string humanTimestamp);
static void overlayEventDetails(unsigned long runNumber, unsigned long eventNumber, const std::string& humanTimestamp);
private:
std::vector<std::string> m_files;
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
......@@ -51,7 +51,7 @@ public:
int runNumber,
int eventNumber,
int timeStamp,
std::string textLabel = "");
const std::string& textLabel = "");
// **** Check if file exists ****
static bool fileExistsAndReadable(const std::string&);
......
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
......@@ -24,9 +24,11 @@
VP1BatchUtilities::VP1BatchUtilities(std::vector<std::string> files) : m_indexFile(0), m_lastIndexFile(0)
VP1BatchUtilities::VP1BatchUtilities(std::vector<std::string> files) :
m_files(files),
m_indexFile(0),
m_lastIndexFile(0)
{
m_files = files;
std::cout << "Got vector of " << files.size() << " items" << std::endl;
// Iterate and print values of vector
for(std::string n : m_files) {
......@@ -90,7 +92,7 @@ void VP1BatchUtilities::overlayATLASlogo()
// Overlay the event details to the image
// it replaces the original image with a version having event details on it
void VP1BatchUtilities::overlayEventDetails(unsigned long runNumber, unsigned long eventNumber, std::string humanTimestamp)
void VP1BatchUtilities::overlayEventDetails(unsigned long runNumber, unsigned long eventNumber, const std::string& humanTimestamp)
{
std::string nRun = std::to_string(runNumber);
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////
......@@ -68,7 +68,7 @@ void VP1FileUtilities::produceNewFile(const std::string& sourceFile,
int runNumber,
int eventNumber,
int timeStamp,
std::string textLabel)
const std::string& textLabel)
{
// Check if the sourceFile exists
QString srcName(sourceFile.c_str());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment