Skip to content

Commit 4668cb4

Browse files
committed
Please consider the following formatting changes
1 parent 9629f7a commit 4668cb4

File tree

2 files changed

+28
-31
lines changed

2 files changed

+28
-31
lines changed

PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,9 @@ struct HfTaskXic0ToXiPi {
106106

107107
void init(InitContext&)
108108
{
109-
std::array<bool, 16> doprocess{doprocessDataWithDCAFitter, doprocessDataWithDCAFitterMl, doprocessDataWithDCAFitterFT0C, doprocessDataWithDCAFitterFT0M, doprocessDataWithDCAFitterMlFT0C, doprocessDataWithDCAFitterMlFT0M, \
110-
doprocessDataWithKFParticle, doprocessDataWithKFParticleMl, doprocessDataWithKFParticleFT0C, doprocessDataWithKFParticleFT0M, doprocessDataWithKFParticleMlFT0C, doprocessDataWithKFParticleMlFT0M, \
111-
doprocessMcWithKFParticle, doprocessMcWithKFParticleMl,doprocessMcWithDCAFitter, doprocessMcWithDCAFitterMl
112-
};
109+
std::array<bool, 16> doprocess{doprocessDataWithDCAFitter, doprocessDataWithDCAFitterMl, doprocessDataWithDCAFitterFT0C, doprocessDataWithDCAFitterFT0M, doprocessDataWithDCAFitterMlFT0C, doprocessDataWithDCAFitterMlFT0M,
110+
doprocessDataWithKFParticle, doprocessDataWithKFParticleMl, doprocessDataWithKFParticleFT0C, doprocessDataWithKFParticleFT0M, doprocessDataWithKFParticleMlFT0C, doprocessDataWithKFParticleMlFT0M,
111+
doprocessMcWithKFParticle, doprocessMcWithKFParticleMl, doprocessMcWithDCAFitter, doprocessMcWithDCAFitterMl};
113112
if ((std::accumulate(doprocess.begin(), doprocess.end(), 0)) != 1) {
114113
LOGP(fatal, "One and only one process function should be enabled at a time.");
115114
}
@@ -178,7 +177,7 @@ struct HfTaskXic0ToXiPi {
178177
}
179178
}
180179

181-
template < bool useCentrality, bool applyMl, typename CandType, typename CollType>
180+
template <bool useCentrality, bool applyMl, typename CandType, typename CollType>
182181
void processDataCent(const CandType& candidate, CollType const& collision)
183182
{
184183
if (candidate.resultSelections() != true) {
@@ -288,7 +287,7 @@ struct HfTaskXic0ToXiPi {
288287
}
289288
}
290289
}
291-
290+
292291
void processDataWithDCAFitter(Xic0Cands const& candidates,
293292
CollisionsWithEvSels const& collisions)
294293
{
@@ -316,7 +315,7 @@ struct HfTaskXic0ToXiPi {
316315
PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticle, "process HfTaskXic0ToXiPi with KFParticle", true);
317316

318317
void processDataWithDCAFitterMl(Xic0CandsMl const& candidates,
319-
CollisionsWithEvSels const& collisions)
318+
CollisionsWithEvSels const& collisions)
320319
{
321320
for (const auto& collision : collisions) {
322321
auto thisCollId = collision.globalIndex();
@@ -342,7 +341,7 @@ struct HfTaskXic0ToXiPi {
342341
PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleMl, "process HfTaskXic0ToXiPi with KFParticle and ML selections", false);
343342

344343
void processDataWithDCAFitterFT0C(Xic0Cands const& candidates,
345-
CollisionsWithFT0C const& collisions)
344+
CollisionsWithFT0C const& collisions)
346345
{
347346
for (const auto& collision : collisions) {
348347
auto thisCollId = collision.globalIndex();
@@ -368,7 +367,7 @@ struct HfTaskXic0ToXiPi {
368367
PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleFT0C, "process HfTaskXic0ToXiPi with KFParticle and with FT0C centrality", false);
369368

370369
void processDataWithDCAFitterFT0M(Xic0Cands const& candidates,
371-
CollisionsWithFT0M const& collisions)
370+
CollisionsWithFT0M const& collisions)
372371
{
373372
for (const auto& collision : collisions) {
374373
auto thisCollId = collision.globalIndex();
@@ -394,18 +393,18 @@ struct HfTaskXic0ToXiPi {
394393
PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleFT0M, "process HfTaskXic0ToXiPi with KFParticle and with FT0M centrality", false);
395394

396395
void processDataWithDCAFitterMlFT0C(Xic0CandsMl const& candidates,
397-
CollisionsWithFT0C const& collisions)
396+
CollisionsWithFT0C const& collisions)
398397
{
399398
for (const auto& collision : collisions) {
400399
auto thisCollId = collision.globalIndex();
401400
auto groupedXicCandidates = candidates.sliceBy(candXicMlPerCollision, thisCollId);
402401
for (const auto& candidate : groupedXicCandidates) {
403402
processDataCent<true, true>(candidate, collision);
404403
}
405-
}
404+
}
406405
}
407406
PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithDCAFitterMlFT0C, "process HfTaskXic0ToXiPi with DCAFitter and ML selections and with FT0C centrality", false);
408-
407+
409408
void processDataWithKFParticleMlFT0C(Xic0CandsMlKF const& candidates,
410409
CollisionsWithFT0C const& collisions)
411410
{
@@ -415,20 +414,20 @@ struct HfTaskXic0ToXiPi {
415414
for (const auto& candidate : groupedXicCandidates) {
416415
processDataCent<true, true>(candidate, collision);
417416
}
418-
}
417+
}
419418
}
420419
PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleMlFT0C, "process HfTaskXic0ToXiPi with KFParticle and ML selections and with FT0C centrality", false);
421420

422421
void processDataWithDCAFitterMlFT0M(Xic0CandsMl const& candidates,
423-
CollisionsWithFT0M const& collisions)
422+
CollisionsWithFT0M const& collisions)
424423
{
425424
for (const auto& collision : collisions) {
426425
auto thisCollId = collision.globalIndex();
427426
auto groupedXicCandidates = candidates.sliceBy(candXicMlPerCollision, thisCollId);
428427
for (const auto& candidate : groupedXicCandidates) {
429428
processDataCent<true, true>(candidate, collision);
430429
}
431-
}
430+
}
432431
}
433432
PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithDCAFitterMlFT0M, "process HfTaskXic0ToXiPi with DCAFitter and ML selections and with FT0M centrality", false);
434433

@@ -441,15 +440,15 @@ struct HfTaskXic0ToXiPi {
441440
for (const auto& candidate : groupedXicCandidates) {
442441
processDataCent<true, true>(candidate, collision);
443442
}
444-
}
443+
}
445444
}
446445
PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleMlFT0M, "process HfTaskXic0ToXiPi with KFParticle and ML selections and with FT0M centrality", false);
447446

448447
void processMcWithDCAFitter(Xic0CandsMc const& Xic0CandidatesMc,
449-
Xic0Gen const& mcParticles,
450-
TracksMc const& tracks,
451-
CollisionsWithMcLabels const& collisions,
452-
aod::McCollisions const& mcCollisions)
448+
Xic0Gen const& mcParticles,
449+
TracksMc const& tracks,
450+
CollisionsWithMcLabels const& collisions,
451+
aod::McCollisions const& mcCollisions)
453452
{
454453
processMc<false>(Xic0CandidatesMc, mcParticles, tracks, collisions, mcCollisions);
455454
}
@@ -466,10 +465,10 @@ struct HfTaskXic0ToXiPi {
466465
PROCESS_SWITCH(HfTaskXic0ToXiPi, processMcWithKFParticle, "Process MC with KFParticle", false);
467466

468467
void processMcWithDCAFitterMl(Xic0CandsMlMc const& Xic0CandidatesMlMc,
469-
Xic0Gen const& mcParticles,
470-
TracksMc const& tracks,
471-
CollisionsWithMcLabels const& collisions,
472-
aod::McCollisions const& mcCollisions)
468+
Xic0Gen const& mcParticles,
469+
TracksMc const& tracks,
470+
CollisionsWithMcLabels const& collisions,
471+
aod::McCollisions const& mcCollisions)
473472
{
474473
processMc<true>(Xic0CandidatesMlMc, mcParticles, tracks, collisions, mcCollisions);
475474
}

PWGHF/TableProducer/candidateSelectorToXiPi.cxx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414
/// \author Federica Zanone <federica.zanone@cern.ch>, Heidelberg University
1515
/// \author Tao Fang <tao.fang@cern.ch>, Central China Normal University
1616

17-
#include <string>
18-
#include <vector>
19-
2017
#include "PWGHF/Core/HfMlResponseXic0ToXiPi.h"
2118
#include "PWGHF/Core/SelectorCuts.h"
22-
2319
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2420
#include "PWGHF/DataModel/CandidateSelectionTables.h"
2521
#include "PWGHF/Utils/utilsAnalysis.h"
@@ -45,6 +41,8 @@
4541

4642
#include <cstdint>
4743
#include <cstdlib>
44+
#include <string>
45+
#include <vector>
4846

4947
using namespace o2;
5048
using namespace o2::aod;
@@ -144,14 +142,14 @@ struct HfCandidateSelectorToXiPi {
144142
Configurable<LabeledArray<double>> cutsMl{"cutsMl", {hf_cuts_ml::Cuts[0], hf_cuts_ml::NBinsPt, hf_cuts_ml::NCutScores, hf_cuts_ml::labelsPt, hf_cuts_ml::labelsCutScore}, "ML selections per pT bin"};
145143
Configurable<int> nClassesMl{"nClassesMl", static_cast<int>(hf_cuts_ml::NCutScores), "Number of classes in ML model"};
146144
Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{"feature1", "feature2"}, "Names of ML model input features"};
147-
145+
148146
// CCDB configuration
149147
Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
150148
Configurable<std::vector<std::string>> modelPathsCCDB{"modelPathsCCDB", std::vector<std::string>{"EventFiltering/PWGHF/BDTXic0ToXipiKf"}, "Paths of models on CCDB"};
151149
Configurable<std::vector<std::string>> onnxFileNames{"onnxFileNames", std::vector<std::string>{"ModelHandler_onnx_Xic0ToXipiKf.onnx"}, "ONNX file names for each pT bin (if not from CCDB full path)"};
152150
Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB"};
153151
Configurable<bool> loadModelsFromCCDB{"loadModelsFromCCDB", false, "Flag to enable or disable the loading of models from CCDB"};
154-
152+
155153
o2::analysis::HfMlResponseXic0ToXiPi<float> hfMlResponse;
156154
std::vector<float> outputMlXic0ToXiPi = {};
157155
o2::ccdb::CcdbApi ccdbApi;
@@ -558,7 +556,7 @@ struct HfCandidateSelectorToXiPi {
558556
} else {
559557
registry.fill(HIST("hSelMassCharmBaryon"), 0);
560558
}
561-
559+
562560
// ML selections
563561
if (applyMl) {
564562
bool isSelectedMlXic0 = false;

0 commit comments

Comments
 (0)