From 1fee4a5fe542a8810772ef5d0911cc993595dc93 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 27 Aug 2025 08:42:21 +0000 Subject: [PATCH] Please consider the following formatting changes --- PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx | 47 +++++++++---------- .../TableProducer/candidateSelectorToXiPi.cxx | 12 ++--- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx b/PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx index def500df2a3..baa549b054d 100644 --- a/PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx +++ b/PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx @@ -106,10 +106,9 @@ struct HfTaskXic0ToXiPi { void init(InitContext&) { - std::array doprocess{doprocessDataWithDCAFitter, doprocessDataWithDCAFitterMl, doprocessDataWithDCAFitterFT0C, doprocessDataWithDCAFitterFT0M, doprocessDataWithDCAFitterMlFT0C, doprocessDataWithDCAFitterMlFT0M, \ - doprocessDataWithKFParticle, doprocessDataWithKFParticleMl, doprocessDataWithKFParticleFT0C, doprocessDataWithKFParticleFT0M, doprocessDataWithKFParticleMlFT0C, doprocessDataWithKFParticleMlFT0M, \ - doprocessMcWithKFParticle, doprocessMcWithKFParticleMl,doprocessMcWithDCAFitter, doprocessMcWithDCAFitterMl - }; + std::array doprocess{doprocessDataWithDCAFitter, doprocessDataWithDCAFitterMl, doprocessDataWithDCAFitterFT0C, doprocessDataWithDCAFitterFT0M, doprocessDataWithDCAFitterMlFT0C, doprocessDataWithDCAFitterMlFT0M, + doprocessDataWithKFParticle, doprocessDataWithKFParticleMl, doprocessDataWithKFParticleFT0C, doprocessDataWithKFParticleFT0M, doprocessDataWithKFParticleMlFT0C, doprocessDataWithKFParticleMlFT0M, + doprocessMcWithKFParticle, doprocessMcWithKFParticleMl, doprocessMcWithDCAFitter, doprocessMcWithDCAFitterMl}; if ((std::accumulate(doprocess.begin(), doprocess.end(), 0)) != 1) { LOGP(fatal, "One and only one process function should be enabled at a time."); } @@ -178,7 +177,7 @@ struct HfTaskXic0ToXiPi { } } - template < bool useCentrality, bool applyMl, typename CandType, typename CollType> + template void processDataCent(const CandType& candidate, CollType const& collision) { if (candidate.resultSelections() != true) { @@ -288,7 +287,7 @@ struct HfTaskXic0ToXiPi { } } } - + void processDataWithDCAFitter(Xic0Cands const& candidates, CollisionsWithEvSels const& collisions) { @@ -316,7 +315,7 @@ struct HfTaskXic0ToXiPi { PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticle, "process HfTaskXic0ToXiPi with KFParticle", true); void processDataWithDCAFitterMl(Xic0CandsMl const& candidates, - CollisionsWithEvSels const& collisions) + CollisionsWithEvSels const& collisions) { for (const auto& collision : collisions) { auto thisCollId = collision.globalIndex(); @@ -342,7 +341,7 @@ struct HfTaskXic0ToXiPi { PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleMl, "process HfTaskXic0ToXiPi with KFParticle and ML selections", false); void processDataWithDCAFitterFT0C(Xic0Cands const& candidates, - CollisionsWithFT0C const& collisions) + CollisionsWithFT0C const& collisions) { for (const auto& collision : collisions) { auto thisCollId = collision.globalIndex(); @@ -368,7 +367,7 @@ struct HfTaskXic0ToXiPi { PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleFT0C, "process HfTaskXic0ToXiPi with KFParticle and with FT0C centrality", false); void processDataWithDCAFitterFT0M(Xic0Cands const& candidates, - CollisionsWithFT0M const& collisions) + CollisionsWithFT0M const& collisions) { for (const auto& collision : collisions) { auto thisCollId = collision.globalIndex(); @@ -394,7 +393,7 @@ struct HfTaskXic0ToXiPi { PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleFT0M, "process HfTaskXic0ToXiPi with KFParticle and with FT0M centrality", false); void processDataWithDCAFitterMlFT0C(Xic0CandsMl const& candidates, - CollisionsWithFT0C const& collisions) + CollisionsWithFT0C const& collisions) { for (const auto& collision : collisions) { auto thisCollId = collision.globalIndex(); @@ -402,10 +401,10 @@ struct HfTaskXic0ToXiPi { for (const auto& candidate : groupedXicCandidates) { processDataCent(candidate, collision); } - } + } } PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithDCAFitterMlFT0C, "process HfTaskXic0ToXiPi with DCAFitter and ML selections and with FT0C centrality", false); - + void processDataWithKFParticleMlFT0C(Xic0CandsMlKF const& candidates, CollisionsWithFT0C const& collisions) { @@ -415,12 +414,12 @@ struct HfTaskXic0ToXiPi { for (const auto& candidate : groupedXicCandidates) { processDataCent(candidate, collision); } - } + } } PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleMlFT0C, "process HfTaskXic0ToXiPi with KFParticle and ML selections and with FT0C centrality", false); void processDataWithDCAFitterMlFT0M(Xic0CandsMl const& candidates, - CollisionsWithFT0M const& collisions) + CollisionsWithFT0M const& collisions) { for (const auto& collision : collisions) { auto thisCollId = collision.globalIndex(); @@ -428,7 +427,7 @@ struct HfTaskXic0ToXiPi { for (const auto& candidate : groupedXicCandidates) { processDataCent(candidate, collision); } - } + } } PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithDCAFitterMlFT0M, "process HfTaskXic0ToXiPi with DCAFitter and ML selections and with FT0M centrality", false); @@ -441,15 +440,15 @@ struct HfTaskXic0ToXiPi { for (const auto& candidate : groupedXicCandidates) { processDataCent(candidate, collision); } - } + } } PROCESS_SWITCH(HfTaskXic0ToXiPi, processDataWithKFParticleMlFT0M, "process HfTaskXic0ToXiPi with KFParticle and ML selections and with FT0M centrality", false); void processMcWithDCAFitter(Xic0CandsMc const& Xic0CandidatesMc, - Xic0Gen const& mcParticles, - TracksMc const& tracks, - CollisionsWithMcLabels const& collisions, - aod::McCollisions const& mcCollisions) + Xic0Gen const& mcParticles, + TracksMc const& tracks, + CollisionsWithMcLabels const& collisions, + aod::McCollisions const& mcCollisions) { processMc(Xic0CandidatesMc, mcParticles, tracks, collisions, mcCollisions); } @@ -466,10 +465,10 @@ struct HfTaskXic0ToXiPi { PROCESS_SWITCH(HfTaskXic0ToXiPi, processMcWithKFParticle, "Process MC with KFParticle", false); void processMcWithDCAFitterMl(Xic0CandsMlMc const& Xic0CandidatesMlMc, - Xic0Gen const& mcParticles, - TracksMc const& tracks, - CollisionsWithMcLabels const& collisions, - aod::McCollisions const& mcCollisions) + Xic0Gen const& mcParticles, + TracksMc const& tracks, + CollisionsWithMcLabels const& collisions, + aod::McCollisions const& mcCollisions) { processMc(Xic0CandidatesMlMc, mcParticles, tracks, collisions, mcCollisions); } diff --git a/PWGHF/TableProducer/candidateSelectorToXiPi.cxx b/PWGHF/TableProducer/candidateSelectorToXiPi.cxx index f501c6a7963..5005de0122a 100644 --- a/PWGHF/TableProducer/candidateSelectorToXiPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorToXiPi.cxx @@ -14,12 +14,8 @@ /// \author Federica Zanone , Heidelberg University /// \author Tao Fang , Central China Normal University -#include -#include - #include "PWGHF/Core/HfMlResponseXic0ToXiPi.h" #include "PWGHF/Core/SelectorCuts.h" - #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsAnalysis.h" @@ -45,6 +41,8 @@ #include #include +#include +#include using namespace o2; using namespace o2::aod; @@ -144,14 +142,14 @@ struct HfCandidateSelectorToXiPi { Configurable> 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"}; Configurable nClassesMl{"nClassesMl", static_cast(hf_cuts_ml::NCutScores), "Number of classes in ML model"}; Configurable> namesInputFeatures{"namesInputFeatures", std::vector{"feature1", "feature2"}, "Names of ML model input features"}; - + // CCDB configuration Configurable ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"}; Configurable> modelPathsCCDB{"modelPathsCCDB", std::vector{"EventFiltering/PWGHF/BDTXic0ToXipiKf"}, "Paths of models on CCDB"}; Configurable> onnxFileNames{"onnxFileNames", std::vector{"ModelHandler_onnx_Xic0ToXipiKf.onnx"}, "ONNX file names for each pT bin (if not from CCDB full path)"}; Configurable timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB"}; Configurable loadModelsFromCCDB{"loadModelsFromCCDB", false, "Flag to enable or disable the loading of models from CCDB"}; - + o2::analysis::HfMlResponseXic0ToXiPi hfMlResponse; std::vector outputMlXic0ToXiPi = {}; o2::ccdb::CcdbApi ccdbApi; @@ -558,7 +556,7 @@ struct HfCandidateSelectorToXiPi { } else { registry.fill(HIST("hSelMassCharmBaryon"), 0); } - + // ML selections if (applyMl) { bool isSelectedMlXic0 = false;