Skip to content

Commit b4e8f5c

Browse files
vkuceravkucera
authored
[Tools] Fix C++ issues (#12028)
1 parent ec413cb commit b4e8f5c

10 files changed

+190
-90
lines changed

‎Tools/PIDML/pidMl.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@
1717
#ifndef TOOLS_PIDML_PIDML_H_
1818
#define TOOLS_PIDML_PIDML_H_
1919

20-
#include "Framework/AnalysisDataModel.h"
21-
#include "Common/DataModel/PIDResponse.h"
22-
#include "Common/DataModel/Centrality.h"
2320
#include "Common/DataModel/Multiplicity.h"
21+
#include "Common/DataModel/PIDResponseTOF.h"
22+
#include "Common/DataModel/PIDResponseTPC.h"
23+
#include "Common/DataModel/TrackSelectionTables.h"
24+
25+
#include <Framework/AnalysisDataModel.h>
26+
27+
#include <cstdint>
2428

2529
namespace o2::aod
2630
{

‎Tools/PIDML/pidMlBatchEffAndPurProducer.cxx‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,39 @@
1616
/// \author Michał Olędzki <m.oledzki@cern.ch>
1717
/// \author Marek Mytkowski <marek.mytkowski@cern.ch>
1818

19-
#include <cstddef>
20-
#include <string_view>
19+
#include "Tools/PIDML/pidOnnxModel.h"
20+
#include "Tools/PIDML/pidUtils.h"
21+
//
22+
#include "Common/DataModel/PIDResponseTOF.h"
23+
#include "Common/DataModel/PIDResponseTPC.h"
24+
#include "Common/DataModel/TrackSelectionTables.h"
25+
26+
#include <CCDB/CcdbApi.h>
27+
#include <Framework/AnalysisDataModel.h>
28+
#include <Framework/AnalysisHelpers.h>
29+
#include <Framework/AnalysisTask.h>
30+
#include <Framework/Configurable.h>
31+
#include <Framework/HistogramRegistry.h>
32+
#include <Framework/HistogramSpec.h>
33+
#include <Framework/InitContext.h>
34+
#include <Framework/OutputObjHeader.h>
35+
#include <Framework/StaticFor.h>
36+
#include <Framework/runDataProcessing.h>
37+
38+
#include <TH1.h>
39+
2140
#include <algorithm>
41+
#include <array>
42+
#include <cmath>
43+
#include <cstddef>
44+
#include <cstdint>
45+
#include <cstdlib>
46+
#include <limits>
47+
#include <memory>
48+
#include <optional>
2249
#include <string>
50+
#include <string_view>
2351
#include <vector>
24-
#include <limits>
25-
26-
#include "Framework/AnalysisDataModel.h"
27-
#include "Framework/runDataProcessing.h"
28-
#include "Framework/AnalysisTask.h"
29-
#include "Framework/StaticFor.h"
30-
#include "CCDB/CcdbApi.h"
31-
#include "Common/DataModel/TrackSelectionTables.h"
32-
#include "Common/DataModel/PIDResponse.h"
33-
#include "Tools/PIDML/pidOnnxModel.h"
34-
#include "Tools/PIDML/pidUtils.h"
3552

3653
using namespace o2;
3754
using namespace o2::framework;

‎Tools/PIDML/pidMlEffAndPurProducer.cxx‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,27 @@
1515
/// \author Michał Olędzki <m.oledzki@cern.ch>
1616
/// \author Marek Mytkowski <marek.mytkowski@cern.ch>
1717

18-
#include <string>
19-
20-
#include "Framework/AnalysisDataModel.h"
21-
#include "Framework/runDataProcessing.h"
22-
#include "Framework/AnalysisTask.h"
23-
#include "CCDB/CcdbApi.h"
24-
#include "Common/DataModel/TrackSelectionTables.h"
25-
#include "Common/DataModel/PIDResponse.h"
2618
#include "Tools/PIDML/pidOnnxModel.h"
2719
#include "Tools/PIDML/pidUtils.h"
20+
//
21+
#include "Common/DataModel/PIDResponseTOF.h"
22+
#include "Common/DataModel/PIDResponseTPC.h"
23+
#include "Common/DataModel/TrackSelectionTables.h"
24+
25+
#include <CCDB/CcdbApi.h>
26+
#include <Framework/AnalysisDataModel.h>
27+
#include <Framework/AnalysisTask.h>
28+
#include <Framework/Configurable.h>
29+
#include <Framework/HistogramRegistry.h>
30+
#include <Framework/HistogramSpec.h>
31+
#include <Framework/InitContext.h>
32+
#include <Framework/OutputObjHeader.h>
33+
#include <Framework/runDataProcessing.h>
34+
35+
#include <cmath>
36+
#include <cstdint>
37+
#include <cstdlib>
38+
#include <string>
2839

2940
using namespace o2;
3041
using namespace o2::framework;
@@ -91,7 +102,7 @@ struct PidMlEffAndPurProducer {
91102
return nSigma;
92103
}
93104

94-
bool isNSigmaAccept(const BigTracks::iterator& track, nSigma_t& nSigma)
105+
bool isNSigmaAccept(const BigTracks::iterator& track, const nSigma_t& nSigma)
95106
{
96107
// FIXME: for current particles it works, but there are some particles,
97108
// which can have different sign and pdgSign

‎Tools/PIDML/pidMlProducer.cxx‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,33 @@
1515
/// \author Maja Kabus <mkabus@cern.ch>
1616
/// \author Marek Mytkowski <marek.mytkowski@cern.ch>
1717

18-
#include <string_view>
19-
#include <limits>
20-
#include "Framework/AnalysisTask.h"
21-
#include "Framework/StaticFor.h"
22-
#include "Framework/AnalysisDataModel.h"
23-
#include "Framework/HistogramRegistry.h"
24-
#include "Framework/runDataProcessing.h"
25-
#include "Common/DataModel/Centrality.h"
26-
#include "Common/DataModel/Multiplicity.h"
27-
#include "Common/DataModel/TrackSelectionTables.h"
2818
#include "Tools/PIDML/pidMl.h"
2919
#include "Tools/PIDML/pidUtils.h"
20+
//
21+
#include "Common/DataModel/Multiplicity.h"
22+
#include "Common/DataModel/PIDResponseTOF.h"
23+
#include "Common/DataModel/PIDResponseTPC.h"
24+
#include "Common/DataModel/TrackSelectionTables.h"
25+
26+
#include <Framework/AnalysisDataModel.h>
27+
#include <Framework/AnalysisHelpers.h>
28+
#include <Framework/AnalysisTask.h>
29+
#include <Framework/Configurable.h>
30+
#include <Framework/HistogramRegistry.h>
31+
#include <Framework/HistogramSpec.h>
32+
#include <Framework/InitContext.h>
33+
#include <Framework/OutputObjHeader.h>
34+
#include <Framework/runDataProcessing.h>
35+
36+
#include <TH1.h>
37+
#include <TH2.h>
38+
#include <TString.h>
39+
40+
#include <array>
41+
#include <cstdint>
42+
#include <limits>
43+
#include <memory>
44+
#include <string_view>
3045

3146
using namespace o2;
3247
using namespace o2::framework;

‎Tools/PIDML/pidOnnxInterface.h‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@
1717
#ifndef TOOLS_PIDML_PIDONNXINTERFACE_H_
1818
#define TOOLS_PIDML_PIDONNXINTERFACE_H_
1919

20-
#include <string>
21-
#include <array>
20+
#include "Tools/PIDML/pidOnnxModel.h"
21+
//
22+
#include <CCDB/CcdbApi.h>
23+
#include <Framework/Array2D.h>
24+
#include <Framework/Logger.h>
25+
26+
#include <cstddef>
27+
#include <cstdint>
2228
#include <set>
29+
#include <string>
2330
#include <vector>
2431

25-
#include "Framework/Array2D.h"
26-
#include "Tools/PIDML/pidOnnxModel.h"
27-
2832
namespace pidml_pt_cuts
2933
{
3034
static constexpr int NPids = 6;
@@ -110,7 +114,7 @@ struct PidONNXInterface {
110114
}
111115

112116
std::vector<PidONNXModel<T>> mModels;
113-
std::size_t mNPids;
117+
std::size_t mNPids{0};
114118
o2::framework::LabeledArray<double> mPLimits;
115119
};
116120
#endif // TOOLS_PIDML_PIDONNXINTERFACE_H_

‎Tools/PIDML/pidOnnxModel.h‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,31 @@
1717
#ifndef TOOLS_PIDML_PIDONNXMODEL_H_
1818
#define TOOLS_PIDML_PIDONNXMODEL_H_
1919

20+
#include "Tools/PIDML/pidUtils.h"
21+
//
22+
#include <CCDB/CcdbApi.h>
2023
#include <Framework/ASoA.h>
21-
#include <array>
24+
#include <Framework/Logger.h>
25+
26+
#include <onnxruntime_c_api.h>
27+
#include <onnxruntime_cxx_api.h>
28+
#include <rapidjson/document.h>
29+
#include <rapidjson/filereadstream.h>
30+
2231
#include <algorithm>
32+
#include <array>
33+
#include <cassert>
2334
#include <cstdint>
24-
#include <cstring>
2535
#include <cstdio>
36+
#include <cstring>
2637
#include <limits>
38+
#include <map>
39+
#include <memory>
2740
#include <optional>
41+
#include <sstream>
2842
#include <string>
29-
#include <map>
30-
#include <type_traits>
3143
#include <utility>
32-
#include <memory>
3344
#include <vector>
34-
#include <onnxruntime_cxx_api.h>
35-
36-
#include "rapidjson/document.h"
37-
#include "rapidjson/filereadstream.h"
38-
#include "CCDB/CcdbApi.h"
39-
#include "Tools/PIDML/pidUtils.h"
4045

4146
enum PidMLDetector {
4247
kTPCOnly = 0,
@@ -57,7 +62,7 @@ constexpr MomentumLimitsMatrix defaultModelPLimits({0.0, 0.5, 0.8});
5762
// TODO: Copied from cefpTask, shall we put it in some common utils code?
5863
namespace
5964
{
60-
bool readJsonFile(const std::string& config, rapidjson::Document& d)
65+
bool readJsonFile(std::string const& config, rapidjson::Document& d)
6166
{
6267
FILE* fp = fopen(config.data(), "rb");
6368
if (!fp) {
@@ -77,7 +82,7 @@ bool readJsonFile(const std::string& config, rapidjson::Document& d)
7782
template <typename T>
7883
struct PidONNXModel {
7984
public:
80-
PidONNXModel(std::string& localPath, std::string& ccdbPath, bool useCCDB, o2::ccdb::CcdbApi& ccdbApi, uint64_t timestamp,
85+
PidONNXModel(std::string const& localPath, std::string const& ccdbPath, bool useCCDB, o2::ccdb::CcdbApi const& ccdbApi, uint64_t timestamp,
8186
int pid, double minCertainty, const double* pLimits = &pidml_pt_cuts::defaultModelPLimits[0])
8287
: mPid(pid), mMinCertainty(minCertainty), mPLimits(pLimits, pLimits + kNDetectors)
8388
{
@@ -136,8 +141,8 @@ struct PidONNXModel {
136141
return getModelOutput(track) >= mMinCertainty;
137142
}
138143

139-
int mPid;
140-
double mMinCertainty;
144+
int mPid{0};
145+
double mMinCertainty{0};
141146

142147
private:
143148
void getModelPaths(std::string const& path, std::string& modelDir, std::string& modelFile, std::string& modelPath, int pid, std::string const& ext)
@@ -155,7 +160,7 @@ struct PidONNXModel {
155160
modelPath = modelDir + "/" + modelFile;
156161
}
157162

158-
void downloadFromCCDB(o2::ccdb::CcdbApi& ccdbApi, std::string const& ccdbFile, uint64_t timestamp, std::string const& localDir, std::string const& localFile)
163+
void downloadFromCCDB(o2::ccdb::CcdbApi const& ccdbApi, std::string const& ccdbFile, uint64_t timestamp, std::string const& localDir, std::string const& localFile)
159164
{
160165
std::map<std::string, std::string> metadata;
161166
bool retrieveSuccess = ccdbApi.retrieveBlob(ccdbFile, localDir, metadata, timestamp, false, localFile);
@@ -167,7 +172,7 @@ struct PidONNXModel {
167172
}
168173
}
169174

170-
void loadInputFiles(std::string const& localPath, std::string const& ccdbPath, bool useCCDB, o2::ccdb::CcdbApi& ccdbApi, uint64_t timestamp, int pid, std::string& modelPath)
175+
void loadInputFiles(std::string const& localPath, std::string const& ccdbPath, bool useCCDB, o2::ccdb::CcdbApi const& ccdbApi, uint64_t timestamp, int pid, std::string& modelPath)
171176
{
172177
rapidjson::Document trainColumnsDoc;
173178
rapidjson::Document scalingParamsDoc;

‎Tools/PIDML/qaPid.cxx‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,29 @@
1414
/// \author Łukasz Sawicki
1515
/// \since
1616

17-
#include "Framework/runDataProcessing.h"
18-
#include "Framework/AnalysisTask.h"
19-
#include "Framework/HistogramRegistry.h"
20-
#include "Framework/StaticFor.h"
17+
#include "Common/DataModel/PIDResponseCombined.h"
18+
#include "Common/DataModel/PIDResponseTOF.h"
19+
#include "Common/DataModel/PIDResponseTPC.h"
2120
#include "Common/DataModel/TrackSelectionTables.h"
22-
#include "Common/DataModel/PIDResponse.h"
23-
#include <TParameter.h>
21+
22+
#include <Framework/ASoA.h>
23+
#include <Framework/AnalysisDataModel.h>
24+
#include <Framework/AnalysisTask.h>
25+
#include <Framework/Configurable.h>
26+
#include <Framework/Expressions.h>
27+
#include <Framework/HistogramRegistry.h>
28+
#include <Framework/HistogramSpec.h>
29+
#include <Framework/StaticFor.h>
30+
#include <Framework/runDataProcessing.h>
31+
#include <ReconstructionDataFormats/PID.h>
32+
2433
#include <TPDGCode.h>
2534

35+
#include <cmath>
36+
#include <cstddef>
37+
#include <cstdlib>
38+
#include <string_view>
39+
2640
using namespace o2;
2741
using namespace o2::framework;
2842
using namespace o2::framework::expressions;
@@ -371,7 +385,7 @@ struct QaPid {
371385
for (int j = 0; j < kArrLen; ++j) {
372386
if (p < PSwitch[j]) {
373387
particleNSigma[j] = std::abs(tpcNSigmas[j]);
374-
} else if (p >= PSwitch[j]) {
388+
} else {
375389
particleNSigma[j] = combinedSignal(tpcNSigmas[j], tofNSigmas[j]);
376390
}
377391
}
@@ -409,7 +423,7 @@ struct QaPid {
409423
for (int j = 0; j < kArrLen; ++j) {
410424
if (p < PSwitch[j]) {
411425
particleNSigma[j] = std::abs(tpcNSigmas[j]);
412-
} else if (p >= PSwitch[j]) {
426+
} else {
413427
particleNSigma[j] = combinedSignal(tpcNSigmas[j], tofNSigmas[j]);
414428
}
415429
}

‎Tools/PIDML/qaPidMl.cxx‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,28 @@
1414
/// \author Łukasz Sawicki
1515
/// \since
1616

17-
#include <string>
18-
19-
#include "Framework/runDataProcessing.h"
20-
#include "Framework/AnalysisTask.h"
21-
#include "Framework/HistogramRegistry.h"
22-
#include "Framework/StaticFor.h"
17+
#include "Tools/PIDML/pidOnnxModel.h"
18+
//
19+
#include "Common/DataModel/PIDResponseTOF.h"
2320
#include "Common/DataModel/TrackSelectionTables.h"
24-
#include "Common/DataModel/PIDResponse.h"
25-
#include <TParameter.h>
21+
22+
#include <CCDB/CcdbApi.h>
23+
#include <Framework/ASoA.h>
24+
#include <Framework/AnalysisDataModel.h>
25+
#include <Framework/AnalysisTask.h>
26+
#include <Framework/Configurable.h>
27+
#include <Framework/Expressions.h>
28+
#include <Framework/HistogramRegistry.h>
29+
#include <Framework/HistogramSpec.h>
30+
#include <Framework/InitContext.h>
31+
#include <Framework/StaticFor.h>
32+
#include <Framework/runDataProcessing.h>
33+
2634
#include <TPDGCode.h>
27-
#include "Tools/PIDML/pidOnnxModel.h"
35+
36+
#include <cstddef>
37+
#include <string>
38+
#include <string_view>
2839

2940
using namespace o2;
3041
using namespace o2::framework;
@@ -311,7 +322,7 @@ struct QaPidMl {
311322

312323
static constexpr float kCertaintyThreshold = 0.5f;
313324

314-
int getParticlePdg(float pidCertainties[])
325+
int getParticlePdg(const float pidCertainties[])
315326
{
316327
// index of the biggest value in an array
317328
int index = 0;

0 commit comments

Comments
 (0)