Skip to content

Commit 6ace6af

Browse files
authored
[PWGHF] Fix argument copies and uninitialised members (#11686)
1 parent ed25c14 commit 6ace6af

File tree

2 files changed

+27
-29
lines changed

2 files changed

+27
-29
lines changed

PWGHF/Core/HfHelper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ class HfHelper
12631263
/// \param mlScores vector with ml scores of charm hadron (position 0:bkg 1:prompt 2:nonprompt)
12641264
/// \return true if b-hadron candidate passes all selections
12651265
template <typename T1, typename T2>
1266-
bool applySelectionDmesMlScoresForB(const T1& cuts, const T2& binsPtC, float ptC, std::vector<float> mlScores)
1266+
bool applySelectionDmesMlScoresForB(const T1& cuts, const T2& binsPtC, float ptC, const std::vector<float>& mlScores)
12671267
{
12681268
int pTBin = o2::analysis::findBin(binsPtC, ptC);
12691269
if (pTBin == -1) {

PWGHF/TableProducer/mcPidTof.cxx

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,30 @@
1616
/// It works only for MC and adds the possibility to apply postcalibrations for MC.
1717
///
1818

19-
#include <map>
20-
#include <utility>
21-
#include <vector>
22-
#include <string>
23-
#include <unordered_map>
24-
25-
#include <TPDGCode.h>
26-
27-
// O2 includes
28-
#include "Framework/runDataProcessing.h"
29-
#include "Framework/AnalysisTask.h"
30-
#include "Framework/HistogramRegistry.h"
31-
#include "ReconstructionDataFormats/Track.h"
32-
#include "CCDB/BasicCCDBManager.h"
33-
#include "TOFBase/EventTimeMaker.h"
34-
35-
// O2Physics includes
36-
#include "TableHelper.h"
37-
#include "MetadataHelper.h"
38-
#include "CollisionTypeHelper.h"
39-
#include "Common/DataModel/TrackSelectionTables.h"
19+
#include "Common/Core/CollisionTypeHelper.h"
20+
#include "Common/Core/MetadataHelper.h"
21+
#include "Common/Core/TableHelper.h"
4022
#include "Common/DataModel/EventSelection.h"
4123
#include "Common/DataModel/FT0Corrected.h"
4224
#include "Common/DataModel/Multiplicity.h"
25+
#include "Common/DataModel/TrackSelectionTables.h"
4326
#include "Common/TableProducer/PID/pidTOFBase.h"
4427

28+
#include <CCDB/BasicCCDBManager.h>
29+
#include <Framework/AnalysisTask.h>
30+
#include <Framework/HistogramRegistry.h>
31+
#include <Framework/runDataProcessing.h>
32+
#include <ReconstructionDataFormats/Track.h>
33+
#include <TOFBase/EventTimeMaker.h>
34+
35+
#include <TPDGCode.h>
36+
37+
#include <map>
38+
#include <string>
39+
#include <unordered_map>
40+
#include <utility>
41+
#include <vector>
42+
4543
using namespace o2;
4644
using namespace o2::framework;
4745
using namespace o2::pid;
@@ -82,14 +80,14 @@ struct TOFCalibConfig {
8280
}
8381

8482
template <typename VType>
85-
void getCfg(o2::framework::InitContext& initContext, const std::string name, VType& v, const std::string task)
83+
void getCfg(o2::framework::InitContext& initContext, const std::string& name, VType& v, const std::string& task)
8684
{
8785
if (!getTaskOptionValue(initContext, task, name, v, false)) {
8886
LOG(fatal) << "Could not get " << name << " from " << task << " task";
8987
}
9088
}
9189

92-
void inheritFromBaseTask(o2::framework::InitContext& initContext, const std::string task = "tof-signal")
90+
void inheritFromBaseTask(o2::framework::InitContext& initContext, const std::string& task = "tof-signal")
9391
{
9492
mInitMode = 2;
9593
getCfg(initContext, "ccdb-url", mUrl, task);
@@ -297,7 +295,7 @@ struct TOFCalibConfig {
297295
// Configurable options
298296
std::string mUrl;
299297
std::string mPathGrpLhcIf;
300-
int64_t mTimestamp;
298+
int64_t mTimestamp{0};
301299
std::string mTimeShiftCCDBPathPos;
302300
std::string mTimeShiftCCDBPathNeg;
303301
std::string mTimeShiftCCDBPathPosMC;
@@ -306,10 +304,10 @@ struct TOFCalibConfig {
306304
std::string mParametrizationPath;
307305
std::string mReconstructionPass;
308306
std::string mReconstructionPassDefault;
309-
bool mFatalOnPassNotAvailable;
310-
bool mEnableTimeDependentResponse;
311-
int mCollisionSystem;
312-
bool mAutoSetProcessFunctions;
307+
bool mFatalOnPassNotAvailable{false};
308+
bool mEnableTimeDependentResponse{false};
309+
int mCollisionSystem{-1};
310+
bool mAutoSetProcessFunctions{false};
313311
};
314312

315313
// Part 1 TOF signal definition

0 commit comments

Comments
 (0)