From 816ec45e25da65ebaaf4b4742a83a985f3412b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Wed, 22 Oct 2025 16:25:29 +0200 Subject: [PATCH 01/13] Add skimming data model header --- PWGHF/DataModel/CandidateSkimmingTables.h | 264 ++++++++++++++++++++++ 1 file changed, 264 insertions(+) create mode 100644 PWGHF/DataModel/CandidateSkimmingTables.h diff --git a/PWGHF/DataModel/CandidateSkimmingTables.h b/PWGHF/DataModel/CandidateSkimmingTables.h new file mode 100644 index 00000000000..2228053edd2 --- /dev/null +++ b/PWGHF/DataModel/CandidateSkimmingTables.h @@ -0,0 +1,264 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// \file CandidateReconstructionTables.h +/// \brief Definitions of tables produced by candidate reconstruction workflows +/// +/// \author Gian Michele Innocenti , CERN +/// \author Vít Kučera , CERN + +#ifndef PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_ +#define PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_ + +#include "PWGHF/Utils/utilsEvSelHf.h" + +#include +#include + +#include +#include + +namespace o2::aod +{ +namespace hf_sel_collision +{ +DECLARE_SOA_COLUMN(WhyRejectColl, whyRejectColl, o2::hf_evsel::HfCollisionRejectionMask); //! +} // namespace hf_sel_collision + +DECLARE_SOA_TABLE(HfSelCollision, "AOD", "HFSELCOLLISION", //! + hf_sel_collision::WhyRejectColl); + +namespace hf_sel_track +{ +DECLARE_SOA_COLUMN(IsSelProng, isSelProng, uint32_t); //! +DECLARE_SOA_COLUMN(IsIdentifiedPid, isIdentifiedPid, uint32_t); //! +DECLARE_SOA_COLUMN(IsPositive, isPositive, bool); //! +} // namespace hf_sel_track + +DECLARE_SOA_TABLE(HfSelTrack, "AOD", "HFSELTRACK", //! + hf_sel_track::IsSelProng, + hf_sel_track::IsIdentifiedPid, + hf_sel_track::IsPositive); + +namespace hf_pv_refit_track +{ +DECLARE_SOA_COLUMN(PvRefitX, pvRefitX, float); //! +DECLARE_SOA_COLUMN(PvRefitY, pvRefitY, float); //! +DECLARE_SOA_COLUMN(PvRefitZ, pvRefitZ, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaX2, pvRefitSigmaX2, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaXY, pvRefitSigmaXY, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaY2, pvRefitSigmaY2, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaXZ, pvRefitSigmaXZ, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaYZ, pvRefitSigmaYZ, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaZ2, pvRefitSigmaZ2, float); //! +DECLARE_SOA_COLUMN(PvRefitDcaXY, pvRefitDcaXY, float); //! +DECLARE_SOA_COLUMN(PvRefitDcaZ, pvRefitDcaZ, float); //! +} // namespace hf_pv_refit_track + +DECLARE_SOA_TABLE(HfPvRefitTrack, "AOD", "HFPVREFITTRACK", //! + hf_pv_refit_track::PvRefitX, + hf_pv_refit_track::PvRefitY, + hf_pv_refit_track::PvRefitZ, + hf_pv_refit_track::PvRefitSigmaX2, + hf_pv_refit_track::PvRefitSigmaXY, + hf_pv_refit_track::PvRefitSigmaY2, + hf_pv_refit_track::PvRefitSigmaXZ, + hf_pv_refit_track::PvRefitSigmaYZ, + hf_pv_refit_track::PvRefitSigmaZ2, + hf_pv_refit_track::PvRefitDcaXY, + hf_pv_refit_track::PvRefitDcaZ); + +namespace hf_track_index +{ +DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index +DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, Tracks, "_0"); //! Index to first prong +DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, Tracks, "_1"); //! Index to second prong +DECLARE_SOA_INDEX_COLUMN_FULL(Prong2, prong2, int, Tracks, "_2"); //! Index to third prong +DECLARE_SOA_INDEX_COLUMN_FULL(Prong3, prong3, int, Tracks, "_3"); //! Index to fourth prong +DECLARE_SOA_INDEX_COLUMN_FULL(Prong4, prong4, int, Tracks, "_4"); //! Index to fifth prong +DECLARE_SOA_INDEX_COLUMN(V0, v0); //! Index to V0 prong +DECLARE_SOA_INDEX_COLUMN(Cascade, cascade); //! Index to cascade prong +DECLARE_SOA_COLUMN(HFflag, hfflag, uint8_t); //! Bitmap to store selection results, o2-linter: disable=name/o2-column (written to disk) + +DECLARE_SOA_COLUMN(FlagD0ToKPi, flagD0ToKPi, uint8_t); //! +DECLARE_SOA_COLUMN(FlagJpsiToEE, flagJpsiToEE, uint8_t); //! +DECLARE_SOA_COLUMN(FlagJpsiToMuMu, flagJpsiToMuMu, uint8_t); //! + +DECLARE_SOA_COLUMN(FlagDplusToPiKPi, flagDplusToPiKPi, uint8_t); //! +DECLARE_SOA_COLUMN(FlagLcToPKPi, flagLcToPKPi, uint8_t); //! +DECLARE_SOA_COLUMN(FlagDsToKKPi, flagDsToKKPi, uint8_t); //! +DECLARE_SOA_COLUMN(FlagXicToPKPi, flagXicToPKPi, uint8_t); //! + +DECLARE_SOA_COLUMN(FlagDstarToD0Pi, flagDstarToD0Pi, uint8_t); //! + +DECLARE_SOA_COLUMN(MlProbSkimD0ToKPi, mlProbSkimD0ToKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for D0->Kpi +DECLARE_SOA_COLUMN(MlProbSkimDplusToPiKPi, mlProbSkimDplusToPiKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for D+->Kpipi +DECLARE_SOA_COLUMN(MlProbSkimDsToKKPi, mlProbSkimDsToKKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for Ds->KKpi +DECLARE_SOA_COLUMN(MlProbSkimLcToPKPi, mlProbSkimLcToPKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for Lc->pKpi +DECLARE_SOA_COLUMN(MlProbSkimXicToPKPi, mlProbSkimXicToPKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for Xic->pKpi +} // namespace hf_track_index + +DECLARE_SOA_TABLE(Hf2Prongs_000, "AOD", "HF2PRONG", //! Table for HF 2 prong candidates (Run 2 converted format) + o2::soa::Index<>, + hf_track_index::Prong0Id, + hf_track_index::Prong1Id, + hf_track_index::HFflag); + +DECLARE_SOA_TABLE_VERSIONED(Hf2Prongs_001, "AOD", "HF2PRONG", 1, //! Table for HF 2 prong candidates (Run 3 format) + o2::soa::Index<>, + hf_track_index::CollisionId, + hf_track_index::Prong0Id, + hf_track_index::Prong1Id, + hf_track_index::HFflag); + +using Hf2Prongs = Hf2Prongs_001; +using Hf2Prong = Hf2Prongs::iterator; + +DECLARE_SOA_TABLE(HfCascades_000, "AOD", "HFCASCADE", //! Table for HF candidates with a V0 (Run 2 converted format) + o2::soa::Index<>, + hf_track_index::Prong0Id, + hf_track_index::V0Id); + +DECLARE_SOA_TABLE_VERSIONED(HfCascades_001, "AOD", "HFCASCADE", 1, //! Table for HF candidates with a V0 (Run 3 format) + o2::soa::Index<>, + hf_track_index::CollisionId, + hf_track_index::Prong0Id, + hf_track_index::V0Id); + +using HfCascades = HfCascades_001; +using HfCascade = HfCascades::iterator; + +DECLARE_SOA_TABLE(Hf3Prongs_000, "AOD", "HF3PRONG", //! Table for HF 3 prong candidates (Run 2 converted format) + o2::soa::Index<>, + hf_track_index::Prong0Id, + hf_track_index::Prong1Id, + hf_track_index::Prong2Id, + hf_track_index::HFflag); + +DECLARE_SOA_TABLE_VERSIONED(Hf3Prongs_001, "AOD", "HF3PRONG", 1, //! Table for HF 3 prong candidates (Run 3 format) + o2::soa::Index<>, + hf_track_index::CollisionId, + hf_track_index::Prong0Id, + hf_track_index::Prong1Id, + hf_track_index::Prong2Id, + hf_track_index::HFflag); + +using Hf3Prongs = Hf3Prongs_001; +using Hf3Prong = Hf3Prongs::iterator; + +DECLARE_SOA_TABLE(HfCascLf2Prongs, "AOD", "HFCASCLF2PRONG", //! Table for HF 2 prong candidates with a Cascade + o2::soa::Index<>, + hf_track_index::CollisionId, + hf_track_index::CascadeId, + hf_track_index::Prong0Id, + hf_track_index::HFflag); +using HfCascLf2Prong = HfCascLf2Prongs::iterator; + +DECLARE_SOA_TABLE(HfCascLf3Prongs, "AOD", "HFCASCLF3PRONG", //! Table for HF 3 prong candidates with a Cascade + o2::soa::Index<>, + hf_track_index::CollisionId, + hf_track_index::CascadeId, + hf_track_index::Prong0Id, + hf_track_index::Prong1Id); +using HfCascLf3Prong = HfCascLf3Prongs::iterator; + +namespace hf_track_index +{ +DECLARE_SOA_INDEX_COLUMN_FULL(ProngD0, prongD0, int, Hf2Prongs, ""); //! Index to a D0 prong +} // namespace hf_track_index + +DECLARE_SOA_TABLE(HfDstars_000, "AOD", "HFDSTAR", //! D* -> D0pi candidates (Run 2 converted format) + o2::soa::Index<>, + hf_track_index::Prong0Id, + hf_track_index::ProngD0Id); + +DECLARE_SOA_TABLE_VERSIONED(HfDstars_001, "AOD", "HFDSTAR", 1, //! D* -> D0pi candidates (Run 3 format) + o2::soa::Index<>, + hf_track_index::CollisionId, + hf_track_index::Prong0Id, + hf_track_index::ProngD0Id); + +using HfDstars = HfDstars_001; +using HfDstar = HfDstars::iterator; + +DECLARE_SOA_TABLE(HfCutStatus2Prong, "AOD", "HFCUTSTATUS2P", //! + hf_track_index::FlagD0ToKPi, + hf_track_index::FlagJpsiToEE, + hf_track_index::FlagJpsiToMuMu); + +DECLARE_SOA_TABLE(HfCutStatus3Prong, "AOD", "HFCUTSTATUS3P", //! + hf_track_index::FlagDplusToPiKPi, + hf_track_index::FlagLcToPKPi, + hf_track_index::FlagDsToKKPi, + hf_track_index::FlagXicToPKPi); + +DECLARE_SOA_TABLE(HfCutStatusDstar, "AOD", "HFCUTSTATUSDST", //! + hf_track_index::FlagDstarToD0Pi); + +DECLARE_SOA_TABLE(Hf2ProngMlProbs, "AOD", "HF2PRONGMLPROB", //! Table for ML scores of HF 2 prong candidates + hf_track_index::MlProbSkimD0ToKPi); + +DECLARE_SOA_TABLE(Hf3ProngMlProbs, "AOD", "HF3PRONGMLPROB", //! Table for ML scores of HF 3 prong candidates + hf_track_index::MlProbSkimDplusToPiKPi, + hf_track_index::MlProbSkimLcToPKPi, + hf_track_index::MlProbSkimDsToKKPi, + hf_track_index::MlProbSkimXicToPKPi); + +namespace hf_pv_refit +{ +DECLARE_SOA_COLUMN(PvRefitX, pvRefitX, float); //! +DECLARE_SOA_COLUMN(PvRefitY, pvRefitY, float); //! +DECLARE_SOA_COLUMN(PvRefitZ, pvRefitZ, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaX2, pvRefitSigmaX2, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaXY, pvRefitSigmaXY, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaY2, pvRefitSigmaY2, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaXZ, pvRefitSigmaXZ, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaYZ, pvRefitSigmaYZ, float); //! +DECLARE_SOA_COLUMN(PvRefitSigmaZ2, pvRefitSigmaZ2, float); //! +} // namespace hf_pv_refit + +DECLARE_SOA_TABLE(HfPvRefit2Prong, "AOD", "HFPVREFIT2PRONG", //! + hf_pv_refit::PvRefitX, + hf_pv_refit::PvRefitY, + hf_pv_refit::PvRefitZ, + hf_pv_refit::PvRefitSigmaX2, + hf_pv_refit::PvRefitSigmaXY, + hf_pv_refit::PvRefitSigmaY2, + hf_pv_refit::PvRefitSigmaXZ, + hf_pv_refit::PvRefitSigmaYZ, + hf_pv_refit::PvRefitSigmaZ2); + +DECLARE_SOA_TABLE(HfPvRefit3Prong, "AOD", "HFPVREFIT3PRONG", //! + hf_pv_refit::PvRefitX, + hf_pv_refit::PvRefitY, + hf_pv_refit::PvRefitZ, + hf_pv_refit::PvRefitSigmaX2, + hf_pv_refit::PvRefitSigmaXY, + hf_pv_refit::PvRefitSigmaY2, + hf_pv_refit::PvRefitSigmaXZ, + hf_pv_refit::PvRefitSigmaYZ, + hf_pv_refit::PvRefitSigmaZ2, + o2::soa::Marker<1>); + +DECLARE_SOA_TABLE(HfPvRefitDstar, "AOD", "HFPVREFITDSTAR", //! + hf_pv_refit::PvRefitX, + hf_pv_refit::PvRefitY, + hf_pv_refit::PvRefitZ, + hf_pv_refit::PvRefitSigmaX2, + hf_pv_refit::PvRefitSigmaXY, + hf_pv_refit::PvRefitSigmaY2, + hf_pv_refit::PvRefitSigmaXZ, + hf_pv_refit::PvRefitSigmaYZ, + hf_pv_refit::PvRefitSigmaZ2, + o2::soa::Marker<2>); +} // namespace o2::aod + +#endif // PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_ From ad9ba4eba40d1f31b5a0358988e3ef3000555c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Wed, 22 Oct 2025 16:33:19 +0200 Subject: [PATCH 02/13] Replace header content --- .../DataModel/CandidateReconstructionTables.h | 235 +----------------- 1 file changed, 1 insertion(+), 234 deletions(-) diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h index deb6644cf25..7b8613e4282 100644 --- a/PWGHF/DataModel/CandidateReconstructionTables.h +++ b/PWGHF/DataModel/CandidateReconstructionTables.h @@ -18,7 +18,7 @@ #ifndef PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ #define PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ -#include "PWGHF/Utils/utilsEvSelHf.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsPid.h" // #include "PWGLF/DataModel/LFStrangenessTables.h" @@ -36,7 +36,6 @@ #include #include -#include namespace o2::aod { @@ -200,238 +199,6 @@ DECLARE_SOA_TABLE(PidTpcTofTinyPr, "AOD", "PIDTPCTOFTINYPR", //! Table of the TP DECLARE_SOA_TABLE(PidTpcTofTinyDe, "AOD", "PIDTPCTOFTINYDE", //! Table of the TPC & TOF Combined NSigma for deuteron pid_tpc_tof_static_tiny::TpcTofNSigmaDe); -namespace hf_sel_collision -{ -DECLARE_SOA_COLUMN(WhyRejectColl, whyRejectColl, o2::hf_evsel::HfCollisionRejectionMask); //! -} // namespace hf_sel_collision - -DECLARE_SOA_TABLE(HfSelCollision, "AOD", "HFSELCOLLISION", //! - hf_sel_collision::WhyRejectColl); - -namespace hf_sel_track -{ -DECLARE_SOA_COLUMN(IsSelProng, isSelProng, uint32_t); //! -DECLARE_SOA_COLUMN(IsIdentifiedPid, isIdentifiedPid, uint32_t); //! -DECLARE_SOA_COLUMN(IsPositive, isPositive, bool); //! -} // namespace hf_sel_track - -DECLARE_SOA_TABLE(HfSelTrack, "AOD", "HFSELTRACK", //! - hf_sel_track::IsSelProng, - hf_sel_track::IsIdentifiedPid, - hf_sel_track::IsPositive); - -namespace hf_pv_refit_track -{ -DECLARE_SOA_COLUMN(PvRefitX, pvRefitX, float); //! -DECLARE_SOA_COLUMN(PvRefitY, pvRefitY, float); //! -DECLARE_SOA_COLUMN(PvRefitZ, pvRefitZ, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaX2, pvRefitSigmaX2, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaXY, pvRefitSigmaXY, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaY2, pvRefitSigmaY2, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaXZ, pvRefitSigmaXZ, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaYZ, pvRefitSigmaYZ, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaZ2, pvRefitSigmaZ2, float); //! -DECLARE_SOA_COLUMN(PvRefitDcaXY, pvRefitDcaXY, float); //! -DECLARE_SOA_COLUMN(PvRefitDcaZ, pvRefitDcaZ, float); //! -} // namespace hf_pv_refit_track - -DECLARE_SOA_TABLE(HfPvRefitTrack, "AOD", "HFPVREFITTRACK", //! - hf_pv_refit_track::PvRefitX, - hf_pv_refit_track::PvRefitY, - hf_pv_refit_track::PvRefitZ, - hf_pv_refit_track::PvRefitSigmaX2, - hf_pv_refit_track::PvRefitSigmaXY, - hf_pv_refit_track::PvRefitSigmaY2, - hf_pv_refit_track::PvRefitSigmaXZ, - hf_pv_refit_track::PvRefitSigmaYZ, - hf_pv_refit_track::PvRefitSigmaZ2, - hf_pv_refit_track::PvRefitDcaXY, - hf_pv_refit_track::PvRefitDcaZ); - -namespace hf_track_index -{ -DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index -DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, Tracks, "_0"); //! Index to first prong -DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, Tracks, "_1"); //! Index to second prong -DECLARE_SOA_INDEX_COLUMN_FULL(Prong2, prong2, int, Tracks, "_2"); //! Index to third prong -DECLARE_SOA_INDEX_COLUMN_FULL(Prong3, prong3, int, Tracks, "_3"); //! Index to fourth prong -DECLARE_SOA_INDEX_COLUMN_FULL(Prong4, prong4, int, Tracks, "_4"); //! Index to fifth prong -DECLARE_SOA_INDEX_COLUMN(V0, v0); //! Index to V0 prong -DECLARE_SOA_INDEX_COLUMN(Cascade, cascade); //! Index to cascade prong -DECLARE_SOA_COLUMN(HFflag, hfflag, uint8_t); //! Bitmap to store selection results, o2-linter: disable=name/o2-column (written to disk) - -DECLARE_SOA_COLUMN(FlagD0ToKPi, flagD0ToKPi, uint8_t); //! -DECLARE_SOA_COLUMN(FlagJpsiToEE, flagJpsiToEE, uint8_t); //! -DECLARE_SOA_COLUMN(FlagJpsiToMuMu, flagJpsiToMuMu, uint8_t); //! - -DECLARE_SOA_COLUMN(FlagDplusToPiKPi, flagDplusToPiKPi, uint8_t); //! -DECLARE_SOA_COLUMN(FlagLcToPKPi, flagLcToPKPi, uint8_t); //! -DECLARE_SOA_COLUMN(FlagDsToKKPi, flagDsToKKPi, uint8_t); //! -DECLARE_SOA_COLUMN(FlagXicToPKPi, flagXicToPKPi, uint8_t); //! - -DECLARE_SOA_COLUMN(FlagDstarToD0Pi, flagDstarToD0Pi, uint8_t); //! - -DECLARE_SOA_COLUMN(MlProbSkimD0ToKPi, mlProbSkimD0ToKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for D0->Kpi -DECLARE_SOA_COLUMN(MlProbSkimDplusToPiKPi, mlProbSkimDplusToPiKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for D+->Kpipi -DECLARE_SOA_COLUMN(MlProbSkimDsToKKPi, mlProbSkimDsToKKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for Ds->KKpi -DECLARE_SOA_COLUMN(MlProbSkimLcToPKPi, mlProbSkimLcToPKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for Lc->pKpi -DECLARE_SOA_COLUMN(MlProbSkimXicToPKPi, mlProbSkimXicToPKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for Xic->pKpi -} // namespace hf_track_index - -DECLARE_SOA_TABLE(Hf2Prongs_000, "AOD", "HF2PRONG", //! Table for HF 2 prong candidates (Run 2 converted format) - o2::soa::Index<>, - hf_track_index::Prong0Id, - hf_track_index::Prong1Id, - hf_track_index::HFflag); - -DECLARE_SOA_TABLE_VERSIONED(Hf2Prongs_001, "AOD", "HF2PRONG", 1, //! Table for HF 2 prong candidates (Run 3 format) - o2::soa::Index<>, - hf_track_index::CollisionId, - hf_track_index::Prong0Id, - hf_track_index::Prong1Id, - hf_track_index::HFflag); - -using Hf2Prongs = Hf2Prongs_001; -using Hf2Prong = Hf2Prongs::iterator; - -DECLARE_SOA_TABLE(HfCascades_000, "AOD", "HFCASCADE", //! Table for HF candidates with a V0 (Run 2 converted format) - o2::soa::Index<>, - hf_track_index::Prong0Id, - hf_track_index::V0Id); - -DECLARE_SOA_TABLE_VERSIONED(HfCascades_001, "AOD", "HFCASCADE", 1, //! Table for HF candidates with a V0 (Run 3 format) - o2::soa::Index<>, - hf_track_index::CollisionId, - hf_track_index::Prong0Id, - hf_track_index::V0Id); - -using HfCascades = HfCascades_001; -using HfCascade = HfCascades::iterator; - -DECLARE_SOA_TABLE(Hf3Prongs_000, "AOD", "HF3PRONG", //! Table for HF 3 prong candidates (Run 2 converted format) - o2::soa::Index<>, - hf_track_index::Prong0Id, - hf_track_index::Prong1Id, - hf_track_index::Prong2Id, - hf_track_index::HFflag); - -DECLARE_SOA_TABLE_VERSIONED(Hf3Prongs_001, "AOD", "HF3PRONG", 1, //! Table for HF 3 prong candidates (Run 3 format) - o2::soa::Index<>, - hf_track_index::CollisionId, - hf_track_index::Prong0Id, - hf_track_index::Prong1Id, - hf_track_index::Prong2Id, - hf_track_index::HFflag); - -using Hf3Prongs = Hf3Prongs_001; -using Hf3Prong = Hf3Prongs::iterator; - -DECLARE_SOA_TABLE(HfCascLf2Prongs, "AOD", "HFCASCLF2PRONG", //! Table for HF 2 prong candidates with a Cascade - o2::soa::Index<>, - hf_track_index::CollisionId, - hf_track_index::CascadeId, - hf_track_index::Prong0Id, - hf_track_index::HFflag); -using HfCascLf2Prong = HfCascLf2Prongs::iterator; - -DECLARE_SOA_TABLE(HfCascLf3Prongs, "AOD", "HFCASCLF3PRONG", //! Table for HF 3 prong candidates with a Cascade - o2::soa::Index<>, - hf_track_index::CollisionId, - hf_track_index::CascadeId, - hf_track_index::Prong0Id, - hf_track_index::Prong1Id); -using HfCascLf3Prong = HfCascLf3Prongs::iterator; - -namespace hf_track_index -{ -DECLARE_SOA_INDEX_COLUMN_FULL(ProngD0, prongD0, int, Hf2Prongs, ""); //! Index to a D0 prong -} // namespace hf_track_index - -DECLARE_SOA_TABLE(HfDstars_000, "AOD", "HFDSTAR", //! D* -> D0pi candidates (Run 2 converted format) - o2::soa::Index<>, - hf_track_index::Prong0Id, - hf_track_index::ProngD0Id); - -DECLARE_SOA_TABLE_VERSIONED(HfDstars_001, "AOD", "HFDSTAR", 1, //! D* -> D0pi candidates (Run 3 format) - o2::soa::Index<>, - hf_track_index::CollisionId, - hf_track_index::Prong0Id, - hf_track_index::ProngD0Id); - -using HfDstars = HfDstars_001; -using HfDstar = HfDstars::iterator; - -DECLARE_SOA_TABLE(HfCutStatus2Prong, "AOD", "HFCUTSTATUS2P", //! - hf_track_index::FlagD0ToKPi, - hf_track_index::FlagJpsiToEE, - hf_track_index::FlagJpsiToMuMu); - -DECLARE_SOA_TABLE(HfCutStatus3Prong, "AOD", "HFCUTSTATUS3P", //! - hf_track_index::FlagDplusToPiKPi, - hf_track_index::FlagLcToPKPi, - hf_track_index::FlagDsToKKPi, - hf_track_index::FlagXicToPKPi); - -DECLARE_SOA_TABLE(HfCutStatusDstar, "AOD", "HFCUTSTATUSDST", //! - hf_track_index::FlagDstarToD0Pi); - -DECLARE_SOA_TABLE(Hf2ProngMlProbs, "AOD", "HF2PRONGMLPROB", //! Table for ML scores of HF 2 prong candidates - hf_track_index::MlProbSkimD0ToKPi); - -DECLARE_SOA_TABLE(Hf3ProngMlProbs, "AOD", "HF3PRONGMLPROB", //! Table for ML scores of HF 3 prong candidates - hf_track_index::MlProbSkimDplusToPiKPi, - hf_track_index::MlProbSkimLcToPKPi, - hf_track_index::MlProbSkimDsToKKPi, - hf_track_index::MlProbSkimXicToPKPi); - -namespace hf_pv_refit -{ -DECLARE_SOA_COLUMN(PvRefitX, pvRefitX, float); //! -DECLARE_SOA_COLUMN(PvRefitY, pvRefitY, float); //! -DECLARE_SOA_COLUMN(PvRefitZ, pvRefitZ, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaX2, pvRefitSigmaX2, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaXY, pvRefitSigmaXY, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaY2, pvRefitSigmaY2, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaXZ, pvRefitSigmaXZ, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaYZ, pvRefitSigmaYZ, float); //! -DECLARE_SOA_COLUMN(PvRefitSigmaZ2, pvRefitSigmaZ2, float); //! -} // namespace hf_pv_refit - -DECLARE_SOA_TABLE(HfPvRefit2Prong, "AOD", "HFPVREFIT2PRONG", //! - hf_pv_refit::PvRefitX, - hf_pv_refit::PvRefitY, - hf_pv_refit::PvRefitZ, - hf_pv_refit::PvRefitSigmaX2, - hf_pv_refit::PvRefitSigmaXY, - hf_pv_refit::PvRefitSigmaY2, - hf_pv_refit::PvRefitSigmaXZ, - hf_pv_refit::PvRefitSigmaYZ, - hf_pv_refit::PvRefitSigmaZ2); - -DECLARE_SOA_TABLE(HfPvRefit3Prong, "AOD", "HFPVREFIT3PRONG", //! - hf_pv_refit::PvRefitX, - hf_pv_refit::PvRefitY, - hf_pv_refit::PvRefitZ, - hf_pv_refit::PvRefitSigmaX2, - hf_pv_refit::PvRefitSigmaXY, - hf_pv_refit::PvRefitSigmaY2, - hf_pv_refit::PvRefitSigmaXZ, - hf_pv_refit::PvRefitSigmaYZ, - hf_pv_refit::PvRefitSigmaZ2, - o2::soa::Marker<1>); - -DECLARE_SOA_TABLE(HfPvRefitDstar, "AOD", "HFPVREFITDSTAR", //! - hf_pv_refit::PvRefitX, - hf_pv_refit::PvRefitY, - hf_pv_refit::PvRefitZ, - hf_pv_refit::PvRefitSigmaX2, - hf_pv_refit::PvRefitSigmaXY, - hf_pv_refit::PvRefitSigmaY2, - hf_pv_refit::PvRefitSigmaXZ, - hf_pv_refit::PvRefitSigmaYZ, - hf_pv_refit::PvRefitSigmaZ2, - o2::soa::Marker<2>); - // general decay properties namespace hf_cand { From c3da9ac238a0be5615e573c16d9acdee32b2fb9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Wed, 22 Oct 2025 19:01:44 +0200 Subject: [PATCH 03/13] Move DecayType --- .../DataModel/CandidateReconstructionTables.h | 57 --------- PWGHF/DataModel/CandidateSkimmingTables.h | 116 ++++++++++++++++++ 2 files changed, 116 insertions(+), 57 deletions(-) diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h index 7b8613e4282..0be39445d60 100644 --- a/PWGHF/DataModel/CandidateReconstructionTables.h +++ b/PWGHF/DataModel/CandidateReconstructionTables.h @@ -440,12 +440,6 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant DECLARE_SOA_COLUMN(KfGeoMassD0, kfGeoMassD0, float); //! mass of the D0 candidate from the KFParticle geometric fit DECLARE_SOA_COLUMN(KfGeoMassD0bar, kfGeoMassD0bar, float); //! mass of the D0bar candidate from the KFParticle geometric fit -// mapping of decay types -enum DecayType { D0ToPiK = 0, - JpsiToEE, - JpsiToMuMu, - N2ProngDecays }; // always keep N2ProngDecays at the end - } // namespace hf_cand_2prong // general columns @@ -664,8 +658,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterProduct, impactParameterProduct, // Im DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterProductJpsi, impactParameterProductJpsi, // J/Psi impact parameter for B+ -> J/Psi K [](float dcaDauPos, float dcaDauNeg) -> float { return dcaDauPos * dcaDauNeg; }); -enum DecayType { BplusToD0Pi = 0 }; - enum DecayTypeMc : uint8_t { BplusToD0PiToKPiPi = 0, BplusToD0KToKPiK, PartlyRecoDecay, @@ -763,14 +755,6 @@ DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int8_t); //! swapping DECLARE_SOA_COLUMN(FlagMcDecayChanRec, flagMcDecayChanRec, int8_t); //! resonant decay channel flag, reconstruction level DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant decay channel flag, generator level -// mapping of decay types -enum DecayType { DplusToPiKPi = 0, - LcToPKPi, - DsToKKPi, - XicToPKPi, - CdToDeKPi, - N3ProngDecays }; // always keep N3ProngDecays at the end - // Ds± → K± K∓ π± or D± → K± K∓ π± enum DecayChannelDToKKPi { @@ -1007,9 +991,6 @@ DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // particle DECLARE_SOA_COLUMN(FlagMcDecayChanRec, flagMcDecayChanRec, int8_t); // resonant decay channel flag, reconstruction level DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); // resonant decay channel flag, generator level -// mapping of decay types -enum DecayType { XToJpsiToEEPiPi = 0, - XToJpsiToMuMuPiPi }; // move this to a dedicated cascade namespace in the future? } // namespace hf_cand_x // declare dedicated X candidate table @@ -1076,8 +1057,6 @@ DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t); // generator level DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); // particle origin, reconstruction level DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // particle origin, generator level DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, int8_t); // debug flag for mis-association reconstruction level -// mapping of decay types -enum DecayType { XiccToXicPi = 0 }; // move this to a dedicated cascade namespace in the future? } // namespace hf_cand_xicc // declare dedicated Xicc candidate table @@ -1396,13 +1375,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(PtPiFromCharmBaryon, ptPiFromCharmBaryon, DECLARE_SOA_DYNAMIC_COLUMN(PtKaFromCasc, ptKaFromCasc, [](float px, float py) -> float { return RecoDecay::pt(px, py); }); -// mapping of decay types -enum DecayType { XiczeroToXiPi = 0, - OmegaczeroToXiPi, - OmegaczeroToOmegaPi, - OmegaczeroToOmegaK, - OmegaczeroToOmegaPiOneMu }; - } // end of namespace hf_cand_xic0_omegac0 // declare dedicated Omegac and Xic to Xi Pi candidate table @@ -1741,10 +1713,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(PProng1, pProng1, //! DECLARE_SOA_DYNAMIC_COLUMN(PProng2, pProng2, //! [](float px, float py, float pz) -> float { return RecoDecay::p(px, py, pz); }); -// mapping of decay types -enum DecayType { XicToXiPiPi = 0, // Ξc± → Ξ∓ π± π± - XicToXiResPiToXiPiPi, // Ξc± → Ξ(1530) π± → Ξ∓ π± π± - NDecayType }; } // end of namespace hf_cand_xic_to_xi_pi_pi // declare dedicated Xic to Xi Pi Pi candidate table @@ -1859,9 +1827,6 @@ DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // particle DECLARE_SOA_COLUMN(FlagMcDecayChanRec, flagMcDecayChanRec, int8_t); // resonant decay channel flag, reconstruction level DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); // resonant decay channel flag, generator level DECLARE_SOA_COLUMN(JpsiToMuMuMass, jpsiToMuMuMass, float); // Jpsi mass -// mapping of decay types -enum DecayType { ChicToJpsiToEEGamma = 0, - ChicToJpsiToMuMuGamma }; // move this to a dedicated cascade namespace in the future? } // namespace hf_cand_chic // declare dedicated chi_c candidate table @@ -1930,8 +1895,6 @@ DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); // particle DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // particle origin, generator level DECLARE_SOA_COLUMN(FlagWrongCollision, flagWrongCollision, int8_t); // reconstruction level DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, int8_t); // debug flag for mis-association reconstruction level -// mapping of decay types -enum DecayType { LbToLcPi }; // move this to a dedicated cascade namespace in the future? enum DecayTypeMc : uint8_t { LbToLcPiToPKPiPi = 0, LbToLcKToPKPiK, @@ -2007,10 +1970,6 @@ DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); // particle DECLARE_SOA_COLUMN(FlagWrongCollision, flagWrongCollision, int8_t); // reconstruction level DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, int8_t); // debug flag for mis-association reconstruction level -// mapping of decay types -enum DecayType { B0ToDPi = 0, - B0ToDstarPi }; - enum DecayTypeMc : uint8_t { B0ToDplusPiToPiKPiPi = 0, B0ToDsPiToKKPiPi, BsToDsPiToKKPiPi, @@ -2139,9 +2098,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterProductJpsi, impactParameterProductJps DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterProductPhi, impactParameterProductPhi, // J/Psi impact parameter for Bs -> J/Psi phi [](float dcaLfTrack0, float dcaLfTrack1) -> float { return dcaLfTrack0 * dcaLfTrack1; }); -// mapping of decay types -enum DecayType { BsToDsPi = 0 }; - enum DecayTypeMc : uint8_t { BsToDsPiToPhiPiPiToKKPiPi = 0, // Bs(bar) → Ds∓ π± → (Phi π∓) π± → (K- K+ π∓) π± BsToDsPiToK0starKPiToKKPiPi, // Bs(bar) → Ds∓ π± → (K0* K∓) π± → (K- K+ π∓) π± B0ToDsPiToPhiPiPiToKKPiPi, // B0(bar) → Ds± π∓ → (Phi π±) π∓ → (K- K+ π±) π∓ @@ -2305,11 +2261,6 @@ DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); //! part DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); //! particle origin, generator level DECLARE_SOA_COLUMN(ParticleAntiparticle, particleAntiparticle, int8_t); //! particle or antiparticle -// mapping of decay types -enum DecayType { Sc0ToPKPiPi = 0, - ScplusplusToPKPiPi, - ScStar0ToPKPiPi, - ScStarPlusPlusToPKPiPi }; enum Species : int { Sc2455 = 0, Sc2520, NSpecies }; @@ -2565,14 +2516,6 @@ DECLARE_SOA_COLUMN(FlagMcMatchGenD0, flagMcMatchGenD0, int8_t); //! generator le DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); //! particle origin, reconstruction level DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); //! particle origin, generator level -enum DecayType { - DstarToD0Pi = 0, - D0ToPiK, - DstarToD0PiPi0, - D0ToPiKPi0, - NDstarDecayType -}; - } // namespace hf_cand_dstar /// D0 (table) from DStar diff --git a/PWGHF/DataModel/CandidateSkimmingTables.h b/PWGHF/DataModel/CandidateSkimmingTables.h index 2228053edd2..ae92c9748f0 100644 --- a/PWGHF/DataModel/CandidateSkimmingTables.h +++ b/PWGHF/DataModel/CandidateSkimmingTables.h @@ -259,6 +259,122 @@ DECLARE_SOA_TABLE(HfPvRefitDstar, "AOD", "HFPVREFITDSTAR", //! hf_pv_refit::PvRefitSigmaYZ, hf_pv_refit::PvRefitSigmaZ2, o2::soa::Marker<2>); + +namespace hf_cand_2prong +{ +enum DecayType { + D0ToPiK = 0, + JpsiToEE, + JpsiToMuMu, + N2ProngDecays +}; // always keep N2ProngDecays at the end +} // namespace hf_cand_2prong + +namespace hf_cand_bplus +{ +enum DecayType { + BplusToD0Pi = 0 +}; +} // namespace hf_cand_bplus + +namespace hf_cand_3prong +{ +enum DecayType { + DplusToPiKPi = 0, + LcToPKPi, + DsToKKPi, + XicToPKPi, + CdToDeKPi, + N3ProngDecays +}; // always keep N3ProngDecays at the end +} // namespace hf_cand_3prong + +namespace hf_cand_x +{ +enum DecayType { + XToJpsiToEEPiPi = 0, + XToJpsiToMuMuPiPi +}; // move this to a dedicated cascade namespace in the future? +} // namespace hf_cand_x + +namespace hf_cand_xicc +{ +enum DecayType { + XiccToXicPi = 0 +}; // move this to a dedicated cascade namespace in the future? +} // namespace hf_cand_xicc + +namespace hf_cand_xic0_omegac0 +{ +enum DecayType { + XiczeroToXiPi = 0, + OmegaczeroToXiPi, + OmegaczeroToOmegaPi, + OmegaczeroToOmegaK, + OmegaczeroToOmegaPiOneMu +}; +} // namespace hf_cand_xic0_omegac0 + +namespace hf_cand_xic_to_xi_pi_pi +{ +enum DecayType { + XicToXiPiPi = 0, // Ξc± → Ξ∓ π± π± + XicToXiResPiToXiPiPi, // Ξc± → Ξ(1530) π± → Ξ∓ π± π± + NDecayType +}; +} // namespace hf_cand_xic_to_xi_pi_pi + +namespace hf_cand_chic +{ +enum DecayType { + ChicToJpsiToEEGamma = 0, + ChicToJpsiToMuMuGamma +}; // move this to a dedicated cascade namespace in the future? +} // namespace hf_cand_chic + +namespace hf_cand_lb +{ +enum DecayType { + LbToLcPi +}; // move this to a dedicated cascade namespace in the future? +} // namespace hf_cand_lb + +namespace hf_cand_b0 +{ +enum DecayType { + B0ToDPi = 0, + B0ToDstarPi +}; +} // namespace hf_cand_b0 + +namespace hf_cand_bs +{ +enum DecayType { + BsToDsPi = 0 +}; +} // namespace hf_cand_bs + +namespace hf_cand_sigmac +{ +enum DecayType { + Sc0ToPKPiPi = 0, + ScplusplusToPKPiPi, + ScStar0ToPKPiPi, + ScStarPlusPlusToPKPiPi +}; +} // namespace hf_cand_sigmac + +namespace hf_cand_dstar +{ +enum DecayType { + DstarToD0Pi = 0, + D0ToPiK, + DstarToD0PiPi0, + D0ToPiKPi0, + NDstarDecayType +}; +} // namespace hf_cand_dstar + } // namespace o2::aod #endif // PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_ From a1e33329118e8666deca15f3ef121510a0aa6993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Wed, 22 Oct 2025 19:02:38 +0200 Subject: [PATCH 04/13] Replace includes in EventFiltering --- EventFiltering/PWGHF/HFFilter.cxx | 4 ++-- EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx | 2 +- EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/EventFiltering/PWGHF/HFFilter.cxx b/EventFiltering/PWGHF/HFFilter.cxx index ed03e983d04..a78eb4f5fd9 100644 --- a/EventFiltering/PWGHF/HFFilter.cxx +++ b/EventFiltering/PWGHF/HFFilter.cxx @@ -23,7 +23,7 @@ #include "EventFiltering/filterTables.h" // #include "PWGHF/Core/SelectorCuts.h" -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" // #include "PWGEM/PhotonMeson/DataModel/gammaTables.h" #include "PWGLF/DataModel/LFStrangenessTables.h" @@ -179,7 +179,7 @@ struct HfFilter { // Main struct for HF triggers Service ccdb; using BigTracksMCPID = soa::Join; - using BigTracksPID = soa::Join; + using BigTracksPID = soa::Join; using TracksIUPID = soa::Join; using CollsWithEvSel = soa::Join; diff --git a/EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx b/EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx index 3cd5a047bb9..00ba6b8d6d5 100644 --- a/EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx +++ b/EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx @@ -17,7 +17,7 @@ #include "EventFiltering/PWGHF/HFFilterHelpers.h" // #include "PWGHF/Core/SelectorCuts.h" -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" // #include "Common/CCDB/EventSelectionParams.h" #include "Common/Core/RecoDecay.h" diff --git a/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx b/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx index b7a9637ba10..66c362e0432 100644 --- a/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx +++ b/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx @@ -20,7 +20,7 @@ #include "EventFiltering/PWGHF/HFFilterHelpers.h" // -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" // #include "Common/Core/RecoDecay.h" #include "Common/Core/trackUtilities.h" @@ -28,8 +28,6 @@ #include "Common/DataModel/PIDResponseTPC.h" #include "Common/DataModel/TrackSelectionTables.h" -#include - #include #include #include From 77a37b28841da06cc878696a4c37fbc826ba9e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Wed, 22 Oct 2025 19:33:22 +0200 Subject: [PATCH 05/13] Move cascade DecayType. Move aliases. --- PWGHF/DataModel/AliasTables.h | 54 ++++++++ .../DataModel/CandidateReconstructionTables.h | 119 +----------------- PWGHF/DataModel/CandidateSkimmingTables.h | 15 +++ 3 files changed, 70 insertions(+), 118 deletions(-) create mode 100644 PWGHF/DataModel/AliasTables.h diff --git a/PWGHF/DataModel/AliasTables.h b/PWGHF/DataModel/AliasTables.h new file mode 100644 index 00000000000..04fabb487f9 --- /dev/null +++ b/PWGHF/DataModel/AliasTables.h @@ -0,0 +1,54 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// \file CandidateReconstructionTables.h +/// \brief Definitions of tables produced by candidate reconstruction workflows +/// +/// \author Gian Michele Innocenti , CERN +/// \author Vít Kučera , CERN + +#ifndef PWGHF_DATAMODEL_ALIASTABLES_H_ +#define PWGHF_DATAMODEL_ALIASTABLES_H_ + +#include + +namespace o2::aod +{ +// Table aliases +using BcFullInfos = soa::Join; + +using TracksWCov = soa::Join; +using TracksWDca = soa::Join; +using TracksWExtra = soa::Join; +using TracksWCovDca = soa::Join; +using TracksWCovExtra = soa::Join; +using TracksWDcaExtra = soa::Join; +using TracksWCovDcaExtra = soa::Join; + +using TracksWMc = soa::Join; + +using TracksPidEl = soa::Join; +using TracksPidMu = soa::Join; +using TracksPidPi = soa::Join; +using TracksPidKa = soa::Join; +using TracksPidPr = soa::Join; +using TracksPidDe = soa::Join; + +using TracksPidTinyEl = soa::Join; +using TracksPidTinyMu = soa::Join; +using TracksPidTinyPi = soa::Join; +using TracksPidTinyKa = soa::Join; +using TracksPidTinyPr = soa::Join; +using TracksPidTinyDe = soa::Join; + +} // namespace o2::aod + +#endif // PWGHF_DATAMODEL_ALIASTABLES_H_ diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h index 0be39445d60..62b5f7456f2 100644 --- a/PWGHF/DataModel/CandidateReconstructionTables.h +++ b/PWGHF/DataModel/CandidateReconstructionTables.h @@ -18,6 +18,7 @@ #ifndef PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ #define PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsPid.h" // @@ -39,116 +40,6 @@ namespace o2::aod { -// Table aliases -using BcFullInfos = soa::Join; - -using TracksWCov = soa::Join; -using TracksWDca = soa::Join; -using TracksWExtra = soa::Join; -using TracksWCovDca = soa::Join; -using TracksWCovExtra = soa::Join; -using TracksWDcaExtra = soa::Join; -using TracksWCovDcaExtra = soa::Join; - -using TracksWMc = soa::Join; - -using TracksPidEl = soa::Join; -using TracksPidMu = soa::Join; -using TracksPidPi = soa::Join; -using TracksPidKa = soa::Join; -using TracksPidPr = soa::Join; -using TracksPidDe = soa::Join; - -using TracksPidTinyEl = soa::Join; -using TracksPidTinyMu = soa::Join; -using TracksPidTinyPi = soa::Join; -using TracksPidTinyKa = soa::Join; -using TracksPidTinyPr = soa::Join; -using TracksPidTinyDe = soa::Join; - -// namespace pid_tpc_tof_utils -// { -// /// Function to combine TPC and TOF NSigma (for ML purposes) -// /// \param tpcNSigma is the (binned) NSigma separation in TPC (if tiny = true) -// /// \param tofNSigma is the (binned) NSigma separation in TOF (if tiny = true) -// /// \return Node containing the combined NSigma of TPC and TOF -// template -// o2::framework::expressions::Node combineNSigma(const T1& tpcNSigma, const T1& tofNSigma) -// { -// float defaultNSigmaTolerance = .1f; -// float defaultNSigma = -999.f + defaultNSigmaTolerance; // -999.f is the default value set in TPCPIDResponse.h and PIDTOF.h - -// if constexpr (tiny) { -// auto tpcBinWidth = 1.f * pidtpc_tiny::binning::bin_width; -// auto tofBinWidth = 1.f * pidtof_tiny::binning::bin_width; - -// return o2::framework::expressions::ifnode((tpcNSigma * tpcBinWidth > defaultNSigma) && (tofNSigma * tofBinWidth > defaultNSigma), o2::framework::expressions::nsqrt(.5f * tpcNSigma * tpcNSigma * tpcBinWidth * tpcBinWidth + .5f * tofNSigma * tofNSigma * tofBinWidth * tofBinWidth), // TPC and TOF -// o2::framework::expressions::ifnode(tpcNSigma * tpcBinWidth > defaultNSigma, o2::framework::expressions::nabs(tpcNSigma * tpcBinWidth), // only TPC -// o2::framework::expressions::ifnode(tofNSigma * tofBinWidth > defaultNSigma, o2::framework::expressions::nabs(tofNSigma * tofBinWidth), // only TOF -// 1.f * tofNSigma * tofBinWidth))); // no TPC nor TOF -// } - -// return o2::framework::expressions::ifnode((tpcNSigma > defaultNSigma) && (tofNSigma > defaultNSigma), o2::framework::expressions::nsqrt(.5f * tpcNSigma * tpcNSigma + .5f * tofNSigma * tofNSigma), // TPC and TOF -// o2::framework::expressions::ifnode(tpcNSigma > defaultNSigma, o2::framework::expressions::nabs(tpcNSigma), // only TPC -// o2::framework::expressions::ifnode(tofNSigma > defaultNSigma, o2::framework::expressions::nabs(tofNSigma), // only TOF -// 1.f * tofNSigma))); // no TPC nor TOF -// } -// } // namespace pid_tpc_tof_utils - -// namespace pid_tpc_tof_full -// { -// // Combined TPC and TOF NSigma -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaEl, tpcTofNSigmaEl, //! Combined NSigma separation with the TPC & TOF detectors for electron -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaEl, o2::aod::pidtof::tofNSigmaEl)); -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaMu, tpcTofNSigmaMu, //! Combined NSigma separation with the TPC & TOF detectors for muon -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaMu, o2::aod::pidtof::tofNSigmaMu)); -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaPi, tpcTofNSigmaPi, //! Combined NSigma separation with the TPC & TOF detectors for pion -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaPi, o2::aod::pidtof::tofNSigmaPi)); -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaKa, tpcTofNSigmaKa, //! Combined NSigma separation with the TPC & TOF detectors for kaon -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaKa, o2::aod::pidtof::tofNSigmaKa)); -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaPr, tpcTofNSigmaPr, //! Combined NSigma separation with the TPC & TOF detectors for proton -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaPr, o2::aod::pidtof::tofNSigmaPr)); -// } // namespace pid_tpc_tof_full - -// namespace pid_tpc_tof_tiny -// { -// // Combined binned TPC and TOF NSigma -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaEl, tpcTofNSigmaEl, //! Combined binned NSigma separation with the TPC & TOF detectors for electron -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc_tiny::tpcNSigmaStoreEl, o2::aod::pidtof_tiny::tofNSigmaStoreEl)); -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaMu, tpcTofNSigmaMu, //! Combined binned NSigma separation with the TPC & TOF detectors for muon -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc_tiny::tpcNSigmaStoreMu, o2::aod::pidtof_tiny::tofNSigmaStoreMu)); -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaPi, tpcTofNSigmaPi, //! Combined binned NSigma separation with the TPC & TOF detectors for pion -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc_tiny::tpcNSigmaStorePi, o2::aod::pidtof_tiny::tofNSigmaStorePi)); -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaKa, tpcTofNSigmaKa, //! Combined binned NSigma separation with the TPC & TOF detectors for kaon -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc_tiny::tpcNSigmaStoreKa, o2::aod::pidtof_tiny::tofNSigmaStoreKa)); -// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaPr, tpcTofNSigmaPr, //! Combined binned NSigma separation with the TPC & TOF detectors for proton -// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc_tiny::tpcNSigmaStorePr, o2::aod::pidtof_tiny::tofNSigmaStorePr)); -// } // namespace pid_tpc_tof_tiny - -// // Extension of per particle tables -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidElExt, TracksPidEl, "PIDELEXT", //! Table of the TPC & TOF Combined NSigma for electron -// pid_tpc_tof_full::TpcTofNSigmaEl); -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidMuExt, TracksPidMu, "PIDMUEXT", //! Table of the TPC & TOF Combined NSigma for muon -// pid_tpc_tof_full::TpcTofNSigmaMu); -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidPiExt, TracksPidPi, "PIDPIEXT", //! Table of the TPC & TOF Combined NSigma for pion -// pid_tpc_tof_full::TpcTofNSigmaPi); -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidKaExt, TracksPidKa, "PIDKAEXT", //! Table of the TPC & TOF Combined NSigma for kaon -// pid_tpc_tof_full::TpcTofNSigmaKa); -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidPrExt, TracksPidPr, "PIDPREXT", //! Table of the TPC & TOF Combined NSigma for proton -// pid_tpc_tof_full::TpcTofNSigmaPr); - -// // Extension of tiny size tables -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyElExt, TracksPidTinyEl, "PIDTINYELEXT", //! Table of the TPC & TOF combined binned NSigma for electron -// pid_tpc_tof_tiny::TpcTofNSigmaEl); -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyMuExt, TracksPidTinyMu, "PIDTINYMUEXT", //! Table of the TPC & TOF combined binned NSigma for muon -// pid_tpc_tof_tiny::TpcTofNSigmaMu); -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyPiExt, TracksPidTinyPi, "PIDTINYPIEXT", //! Table of the TPC & TOF combined binned NSigma for pion -// pid_tpc_tof_tiny::TpcTofNSigmaPi); -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyKaExt, TracksPidTinyKa, "PIDTINYKAEXT", //! Table of the TPC & TOF combined binned NSigma for kaon -// pid_tpc_tof_tiny::TpcTofNSigmaKa); -// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyPrExt, TracksPidTinyPr, "PIDTINYPREXT", //! Table of the TPC & TOF combined binned NSigma for proton -// pid_tpc_tof_tiny::TpcTofNSigmaPr); - namespace pid_tpc_tof_static_full { // Combined TPC and TOF NSigma @@ -967,17 +858,9 @@ using HfCandBplusToJpsi = soa::Join; namespace hf_cand_casc_lf { -// mapping of decay types -enum DecayType2Prong { XiczeroOmegaczeroToXiPi = 0, - OmegaczeroToOmegaPi, - OmegaczeroToOmegaK, - N2ProngDecays }; // always keep N2ProngDecays at the end // mapping of construct method enum ConstructMethod { DcaFitter = 0, KfParticle }; -// mapping of decay types -enum DecayType3Prong { XicplusToXiPiPi = 0, - N3ProngDecays }; // always keep N3ProngDecays at the end } // namespace hf_cand_casc_lf namespace hf_cand_x diff --git a/PWGHF/DataModel/CandidateSkimmingTables.h b/PWGHF/DataModel/CandidateSkimmingTables.h index ae92c9748f0..a8809c16572 100644 --- a/PWGHF/DataModel/CandidateSkimmingTables.h +++ b/PWGHF/DataModel/CandidateSkimmingTables.h @@ -375,6 +375,21 @@ enum DecayType { }; } // namespace hf_cand_dstar +namespace hf_cand_casc_lf +{ +enum DecayType2Prong { + XiczeroOmegaczeroToXiPi = 0, + OmegaczeroToOmegaPi, + OmegaczeroToOmegaK, + N2ProngDecays +}; // always keep N2ProngDecays at the end + +enum DecayType3Prong { + XicplusToXiPiPi = 0, + N3ProngDecays +}; // always keep N3ProngDecays at the end +} // namespace hf_cand_casc_lf + } // namespace o2::aod #endif // PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_ From ed635de4604f3c030c97e06ee6b7ff6a7bc99eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Wed, 22 Oct 2025 20:10:52 +0200 Subject: [PATCH 06/13] Finish data model split --- PWGHF/DataModel/AliasTables.h | 11 +++++++---- PWGHF/DataModel/CandidateReconstructionTables.h | 4 ---- PWGHF/DataModel/CandidateSkimmingTables.h | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/PWGHF/DataModel/AliasTables.h b/PWGHF/DataModel/AliasTables.h index 04fabb487f9..37e396770db 100644 --- a/PWGHF/DataModel/AliasTables.h +++ b/PWGHF/DataModel/AliasTables.h @@ -9,8 +9,8 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file CandidateReconstructionTables.h -/// \brief Definitions of tables produced by candidate reconstruction workflows +/// \file AliasTables.h +/// \brief Table aliases /// /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN @@ -18,11 +18,15 @@ #ifndef PWGHF_DATAMODEL_ALIASTABLES_H_ #define PWGHF_DATAMODEL_ALIASTABLES_H_ +#include "Common/DataModel/EventSelection.h" +#include "Common/DataModel/PIDResponseTOF.h" +#include "Common/DataModel/PIDResponseTPC.h" +#include "Common/DataModel/TrackSelectionTables.h" + #include namespace o2::aod { -// Table aliases using BcFullInfos = soa::Join; using TracksWCov = soa::Join; @@ -48,7 +52,6 @@ using TracksPidTinyPi = soa::Join; using TracksPidTinyKa = soa::Join; using TracksPidTinyPr = soa::Join; using TracksPidTinyDe = soa::Join; - } // namespace o2::aod #endif // PWGHF_DATAMODEL_ALIASTABLES_H_ diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h index 62b5f7456f2..f261a383485 100644 --- a/PWGHF/DataModel/CandidateReconstructionTables.h +++ b/PWGHF/DataModel/CandidateReconstructionTables.h @@ -26,10 +26,6 @@ #include "ALICE3/DataModel/ECAL.h" #include "Common/Core/RecoDecay.h" -#include "Common/DataModel/EventSelection.h" -#include "Common/DataModel/PIDResponseTOF.h" -#include "Common/DataModel/PIDResponseTPC.h" -#include "Common/DataModel/TrackSelectionTables.h" #include #include diff --git a/PWGHF/DataModel/CandidateSkimmingTables.h b/PWGHF/DataModel/CandidateSkimmingTables.h index a8809c16572..95cf10751dd 100644 --- a/PWGHF/DataModel/CandidateSkimmingTables.h +++ b/PWGHF/DataModel/CandidateSkimmingTables.h @@ -9,8 +9,8 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file CandidateReconstructionTables.h -/// \brief Definitions of tables produced by candidate reconstruction workflows +/// \file CandidateSkimmingTables.h +/// \brief Definitions of tables produced by candidate skimming workflows /// /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN From 1191ccad11e3592237dbb27e5df7fa0e55df4239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Wed, 22 Oct 2025 20:17:14 +0200 Subject: [PATCH 07/13] IWYU --- PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx | 3 +++ PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx | 2 ++ PWGHF/D2H/Tasks/taskB0.cxx | 1 + PWGHF/D2H/Tasks/taskBplus.cxx | 1 + PWGHF/D2H/Tasks/taskBs.cxx | 1 + PWGHF/D2H/Tasks/taskCd.cxx | 1 + PWGHF/D2H/Tasks/taskD0.cxx | 2 ++ PWGHF/D2H/Tasks/taskDplus.cxx | 1 + PWGHF/D2H/Tasks/taskDs.cxx | 2 ++ PWGHF/D2H/Tasks/taskDstarToD0Pi.cxx | 1 + PWGHF/D2H/Tasks/taskLb.cxx | 1 + PWGHF/D2H/Tasks/taskLc.cxx | 2 ++ PWGHF/D2H/Tasks/taskLcToK0sP.cxx | 1 + PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx | 2 ++ PWGHF/D2H/Tasks/taskSigmac.cxx | 2 ++ PWGHF/D2H/Tasks/taskXic.cxx | 2 ++ PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx | 1 + PWGHF/D2H/Tasks/taskXicToXiPiPi.cxx | 2 ++ PWGHF/D2H/Tasks/taskXicc.cxx | 2 ++ PWGHF/DataModel/CandidateReconstructionTables.h | 1 - PWGHF/DataModel/DerivedTables.h | 1 + PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx | 2 ++ PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx | 2 ++ PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx | 2 ++ PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx | 2 ++ PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx | 2 ++ PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 2 ++ PWGHF/HFC/TableProducer/correlatorDstarHadrons.cxx | 1 + PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx | 2 ++ PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx | 3 +++ .../TableProducer/derivedDataCreatorCorrelationsReduced.cxx | 1 + PWGHF/HFC/TableProducer/femtoDreamProducer.cxx | 1 + PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx | 1 + PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx | 2 ++ PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx | 2 ++ PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx | 2 ++ PWGHF/HFC/Tasks/taskFlow.cxx | 2 ++ PWGHF/HFC/Utils/utilsCorrelations.h | 2 +- PWGHF/HFL/TableProducer/treeCreatorElectronDCA.cxx | 2 +- PWGHF/TableProducer/candidateCreator2Prong.cxx | 2 ++ PWGHF/TableProducer/candidateCreator3Prong.cxx | 2 ++ PWGHF/TableProducer/candidateCreatorB0.cxx | 1 + PWGHF/TableProducer/candidateCreatorBplus.cxx | 2 ++ PWGHF/TableProducer/candidateCreatorBs.cxx | 1 + PWGHF/TableProducer/candidateCreatorCascade.cxx | 2 ++ PWGHF/TableProducer/candidateCreatorDstar.cxx | 2 ++ PWGHF/TableProducer/candidateCreatorLb.cxx | 2 ++ PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx | 3 +++ PWGHF/TableProducer/candidateCreatorSigmac0plusplusCascade.cxx | 1 + PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx | 3 +++ PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx | 3 +++ PWGHF/TableProducer/candidateCreatorXicc.cxx | 3 +++ PWGHF/TableProducer/candidateSelectorB0ToDPi.cxx | 1 + PWGHF/TableProducer/candidateSelectorBplusToD0Pi.cxx | 1 + PWGHF/TableProducer/candidateSelectorBsToDsPi.cxx | 1 + PWGHF/TableProducer/candidateSelectorCd.cxx | 2 ++ PWGHF/TableProducer/candidateSelectorD0.cxx | 2 ++ PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx | 2 ++ PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx | 2 ++ PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx | 2 ++ PWGHF/TableProducer/candidateSelectorLbToLcPi.cxx | 1 + PWGHF/TableProducer/candidateSelectorLc.cxx | 2 ++ PWGHF/TableProducer/candidateSelectorLcPidMl.cxx | 2 ++ PWGHF/TableProducer/candidateSelectorLcToK0sP.cxx | 1 + PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaKa.cxx | 1 + PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPi.cxx | 1 + PWGHF/TableProducer/candidateSelectorOmegac0Xic0ToOmegaKa.cxx | 1 + PWGHF/TableProducer/candidateSelectorToXiPi.cxx | 1 + PWGHF/TableProducer/candidateSelectorXic0ToXiPiKf.cxx | 1 + PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx | 2 ++ PWGHF/TableProducer/candidateSelectorXicToXiPiPi.cxx | 1 + PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx | 2 ++ PWGHF/TableProducer/converterDstarIndices.cxx | 2 +- PWGHF/TableProducer/derivedDataCreatorB0ToDPi.cxx | 1 + PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx | 1 + PWGHF/TableProducer/derivedDataCreatorDplusToPiKPi.cxx | 1 + PWGHF/TableProducer/derivedDataCreatorDsToKKPi.cxx | 1 + PWGHF/TableProducer/derivedDataCreatorDstarToD0Pi.cxx | 1 + PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx | 1 + PWGHF/TableProducer/derivedDataCreatorXicToXiPiPi.cxx | 2 ++ PWGHF/TableProducer/pidCreator.cxx | 1 + PWGHF/TableProducer/refitPvDummy.cxx | 2 +- PWGHF/TableProducer/trackIndexSkimCreator.cxx | 3 ++- PWGHF/TableProducer/treeCreatorB0ToDPi.cxx | 1 + PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx | 1 + PWGHF/TableProducer/treeCreatorBsToDsPi.cxx | 1 + PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx | 1 + PWGHF/TableProducer/treeCreatorDsToKKPi.cxx | 1 + PWGHF/TableProducer/treeCreatorDstarToD0Pi.cxx | 1 + PWGHF/TableProducer/treeCreatorLcToK0sP.cxx | 1 + PWGHF/TableProducer/treeCreatorLcToPKPi.cxx | 1 + PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx | 1 + PWGHF/TableProducer/treeCreatorOmegacSt.cxx | 2 +- PWGHF/TableProducer/treeCreatorSigmacCorrBkg.cxx | 2 ++ PWGHF/TableProducer/treeCreatorTccToD0D0Pi.cxx | 1 + PWGHF/TableProducer/treeCreatorXicToXiPiPi.cxx | 1 + PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx | 1 + PWGHF/Tasks/taskLcCentrality.cxx | 2 ++ PWGHF/Tasks/taskMcEfficiency.cxx | 1 + PWGHF/Tasks/taskMcEfficiencyToXiPi.cxx | 1 + PWGHF/Tasks/taskMcValidation.cxx | 2 ++ PWGHF/Tasks/taskSelOptimisation.cxx | 2 ++ PWGJE/Core/JetHFUtilities.h | 1 + 103 files changed, 155 insertions(+), 7 deletions(-) diff --git a/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx index bc208719ee6..448e3bf5e13 100644 --- a/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx +++ b/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx @@ -19,12 +19,15 @@ /// \author Biao Zhang , Heidelberg University #include "PWGHF/Core/CentralityEstimation.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/D2H/DataModel/ReducedDataModel.h" #include "PWGHF/D2H/Utils/utilsRedDataFormat.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx index 4778fcc168e..99110ef453c 100644 --- a/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx +++ b/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx @@ -21,8 +21,10 @@ #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/D2H/DataModel/ReducedDataModel.h" #include "PWGHF/D2H/Utils/utilsRedDataFormat.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/D2H/Tasks/taskB0.cxx b/PWGHF/D2H/Tasks/taskB0.cxx index 54effeb26ea..02bb5254368 100644 --- a/PWGHF/D2H/Tasks/taskB0.cxx +++ b/PWGHF/D2H/Tasks/taskB0.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskBplus.cxx b/PWGHF/D2H/Tasks/taskBplus.cxx index 9b619329d25..3f9e31f222c 100644 --- a/PWGHF/D2H/Tasks/taskBplus.cxx +++ b/PWGHF/D2H/Tasks/taskBplus.cxx @@ -21,6 +21,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskBs.cxx b/PWGHF/D2H/Tasks/taskBs.cxx index 6d41a59ba82..ea2047a5342 100644 --- a/PWGHF/D2H/Tasks/taskBs.cxx +++ b/PWGHF/D2H/Tasks/taskBs.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskCd.cxx b/PWGHF/D2H/Tasks/taskCd.cxx index 7684e03ed0e..cf4fc78d9fe 100644 --- a/PWGHF/D2H/Tasks/taskCd.cxx +++ b/PWGHF/D2H/Tasks/taskCd.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/DataModel/Centrality.h" #include "Common/DataModel/EventSelection.h" diff --git a/PWGHF/D2H/Tasks/taskD0.cxx b/PWGHF/D2H/Tasks/taskD0.cxx index a64369339ea..98fd34d18fb 100644 --- a/PWGHF/D2H/Tasks/taskD0.cxx +++ b/PWGHF/D2H/Tasks/taskD0.cxx @@ -19,8 +19,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "Common/CCDB/ctpRateFetcher.h" diff --git a/PWGHF/D2H/Tasks/taskDplus.cxx b/PWGHF/D2H/Tasks/taskDplus.cxx index 7a4851d4766..ef6f6be71b3 100644 --- a/PWGHF/D2H/Tasks/taskDplus.cxx +++ b/PWGHF/D2H/Tasks/taskDplus.cxx @@ -23,6 +23,7 @@ #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "PWGHF/Utils/utilsEvSelHf.h" diff --git a/PWGHF/D2H/Tasks/taskDs.cxx b/PWGHF/D2H/Tasks/taskDs.cxx index eb93b29ba17..553cd63caaf 100644 --- a/PWGHF/D2H/Tasks/taskDs.cxx +++ b/PWGHF/D2H/Tasks/taskDs.cxx @@ -20,8 +20,10 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "PWGHF/Utils/utilsEvSelHf.h" diff --git a/PWGHF/D2H/Tasks/taskDstarToD0Pi.cxx b/PWGHF/D2H/Tasks/taskDstarToD0Pi.cxx index f5a3884f5fa..7bc69aaaf0f 100644 --- a/PWGHF/D2H/Tasks/taskDstarToD0Pi.cxx +++ b/PWGHF/D2H/Tasks/taskDstarToD0Pi.cxx @@ -19,6 +19,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskLb.cxx b/PWGHF/D2H/Tasks/taskLb.cxx index feb4444386d..dda79b2bd46 100644 --- a/PWGHF/D2H/Tasks/taskLb.cxx +++ b/PWGHF/D2H/Tasks/taskLb.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskLc.cxx b/PWGHF/D2H/Tasks/taskLc.cxx index 4b5713bce36..9747c0f4213 100644 --- a/PWGHF/D2H/Tasks/taskLc.cxx +++ b/PWGHF/D2H/Tasks/taskLc.cxx @@ -24,8 +24,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGUD/Core/UPCHelpers.h" diff --git a/PWGHF/D2H/Tasks/taskLcToK0sP.cxx b/PWGHF/D2H/Tasks/taskLcToK0sP.cxx index 955331e6d3f..7118cfedb38 100644 --- a/PWGHF/D2H/Tasks/taskLcToK0sP.cxx +++ b/PWGHF/D2H/Tasks/taskLcToK0sP.cxx @@ -19,6 +19,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx b/PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx index 8a92286c42c..c0b54e5d715 100644 --- a/PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx +++ b/PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx @@ -15,9 +15,11 @@ /// \author Fabio Catalano , University of Houston #include "PWGHF/Core/CentralityEstimation.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGLF/DataModel/mcCentrality.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGHF/D2H/Tasks/taskSigmac.cxx b/PWGHF/D2H/Tasks/taskSigmac.cxx index e6e9fbe4e1f..0301ed5662e 100644 --- a/PWGHF/D2H/Tasks/taskSigmac.cxx +++ b/PWGHF/D2H/Tasks/taskSigmac.cxx @@ -16,8 +16,10 @@ /// \author Mattia Faggin , University and INFN PADOVA #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/D2H/Utils/utilsSigmac.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskXic.cxx b/PWGHF/D2H/Tasks/taskXic.cxx index 4d517f9fdfb..9d2d077f44e 100644 --- a/PWGHF/D2H/Tasks/taskXic.cxx +++ b/PWGHF/D2H/Tasks/taskXic.cxx @@ -22,8 +22,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx b/PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx index cccd82fce67..5bf3f321076 100644 --- a/PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx +++ b/PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx @@ -15,6 +15,7 @@ /// \author Ran Tu , Fudan University #include "PWGHF/Core/CentralityEstimation.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskXicToXiPiPi.cxx b/PWGHF/D2H/Tasks/taskXicToXiPiPi.cxx index 79853e9dc46..256fd600a69 100644 --- a/PWGHF/D2H/Tasks/taskXicToXiPiPi.cxx +++ b/PWGHF/D2H/Tasks/taskXicToXiPiPi.cxx @@ -17,7 +17,9 @@ /// \author Carolina Reetz , Heidelberg University /// \author Jaeyoon Cho , Inha University +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/D2H/Tasks/taskXicc.cxx b/PWGHF/D2H/Tasks/taskXicc.cxx index 2c8e6fcd789..b44b4e9365e 100644 --- a/PWGHF/D2H/Tasks/taskXicc.cxx +++ b/PWGHF/D2H/Tasks/taskXicc.cxx @@ -16,8 +16,10 @@ /// \author Gian Michele Innocenti , CERN /// \author Jinjoo Seo , Inha University +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h index f261a383485..bf56c6c8550 100644 --- a/PWGHF/DataModel/CandidateReconstructionTables.h +++ b/PWGHF/DataModel/CandidateReconstructionTables.h @@ -18,7 +18,6 @@ #ifndef PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ #define PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ -#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsPid.h" // diff --git a/PWGHF/DataModel/DerivedTables.h b/PWGHF/DataModel/DerivedTables.h index e3602a0ba63..00170d567e2 100644 --- a/PWGHF/DataModel/DerivedTables.h +++ b/PWGHF/DataModel/DerivedTables.h @@ -17,6 +17,7 @@ #define PWGHF_DATAMODEL_DERIVEDTABLES_H_ #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/DataModel/Centrality.h" diff --git a/PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx b/PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx index 62b9f6b08ea..e965ec6e735 100644 --- a/PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx +++ b/PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx @@ -17,8 +17,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx b/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx index d43a90b79d2..761ff73715a 100644 --- a/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx +++ b/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx @@ -17,8 +17,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx b/PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx index 7408b3f947b..f58bc0be497 100644 --- a/PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx @@ -18,8 +18,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx b/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx index 277f07d0eec..13af748d85e 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx @@ -17,8 +17,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index 2b7908f4dd5..a6639ea791b 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -16,8 +16,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index 315036c2fd7..c4ebb6bba14 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -17,8 +17,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" diff --git a/PWGHF/HFC/TableProducer/correlatorDstarHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDstarHadrons.cxx index b24806c1b5c..ff27fa3f3e9 100644 --- a/PWGHF/HFC/TableProducer/correlatorDstarHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDstarHadrons.cxx @@ -15,6 +15,7 @@ /// \brief Correlator for D* and hadrons. This task is used to produce table for D* and hadron pairs. +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" diff --git a/PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx index 59360564a88..0c75fb4e2f4 100644 --- a/PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx @@ -19,8 +19,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx index bf1b3b1aa0b..125367cdcfe 100644 --- a/PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx @@ -17,10 +17,13 @@ /// \author Ravindra Singh #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx b/PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx index df5feed033e..d02f69211d2 100644 --- a/PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx +++ b/PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h" diff --git a/PWGHF/HFC/TableProducer/femtoDreamProducer.cxx b/PWGHF/HFC/TableProducer/femtoDreamProducer.cxx index 3dfb0ad918f..e209a609349 100644 --- a/PWGHF/HFC/TableProducer/femtoDreamProducer.cxx +++ b/PWGHF/HFC/TableProducer/femtoDreamProducer.cxx @@ -25,6 +25,7 @@ #include "PWGHF/Core/HfMlResponseDplusToPiKPi.h" #include "PWGHF/Core/HfMlResponseLcToPKPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" diff --git a/PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx index 78aa10b08b9..611df82cef0 100644 --- a/PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx +++ b/PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx @@ -19,6 +19,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" diff --git a/PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx index aa8a6ea4d42..147e65a1d0f 100644 --- a/PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx +++ b/PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx @@ -16,8 +16,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx index e80fadbbbc9..684bcade325 100644 --- a/PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx +++ b/PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx @@ -17,8 +17,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx index bd641ddee02..97234665446 100644 --- a/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx +++ b/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx @@ -17,8 +17,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/Tasks/taskFlow.cxx b/PWGHF/HFC/Tasks/taskFlow.cxx index 448d4c5769c..a4e15ff880b 100644 --- a/PWGHF/HFC/Tasks/taskFlow.cxx +++ b/PWGHF/HFC/Tasks/taskFlow.cxx @@ -18,8 +18,10 @@ #include "PWGCF/Core/CorrelationContainer.h" #include "PWGCF/Core/PairCuts.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsPid.h" #include "PWGMM/Mult/DataModel/bestCollisionTable.h" diff --git a/PWGHF/HFC/Utils/utilsCorrelations.h b/PWGHF/HFC/Utils/utilsCorrelations.h index 3cbef6ee2de..acb889e143c 100644 --- a/PWGHF/HFC/Utils/utilsCorrelations.h +++ b/PWGHF/HFC/Utils/utilsCorrelations.h @@ -17,7 +17,7 @@ #define PWGHF_HFC_UTILS_UTILSCORRELATIONS_H_ #include "PWGHF/Core/DecayChannels.h" -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "Common/DataModel/PIDResponseTOF.h" #include "Common/DataModel/PIDResponseTPC.h" diff --git a/PWGHF/HFL/TableProducer/treeCreatorElectronDCA.cxx b/PWGHF/HFL/TableProducer/treeCreatorElectronDCA.cxx index acd38174698..cafd10c8003 100644 --- a/PWGHF/HFL/TableProducer/treeCreatorElectronDCA.cxx +++ b/PWGHF/HFL/TableProducer/treeCreatorElectronDCA.cxx @@ -15,7 +15,7 @@ /// \author Martin Voelkl , University of Birmingham #include "PWGHF/Core/HfHelper.h" -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/AliasTables.h" #include "Common/Core/RecoDecay.h" #include "Common/DataModel/TrackSelectionTables.h" diff --git a/PWGHF/TableProducer/candidateCreator2Prong.cxx b/PWGHF/TableProducer/candidateCreator2Prong.cxx index d7805b491ab..e56b8fb7f79 100644 --- a/PWGHF/TableProducer/candidateCreator2Prong.cxx +++ b/PWGHF/TableProducer/candidateCreator2Prong.cxx @@ -22,7 +22,9 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsMcGen.h" diff --git a/PWGHF/TableProducer/candidateCreator3Prong.cxx b/PWGHF/TableProducer/candidateCreator3Prong.cxx index ca1363ba0c8..8b06342e997 100644 --- a/PWGHF/TableProducer/candidateCreator3Prong.cxx +++ b/PWGHF/TableProducer/candidateCreator3Prong.cxx @@ -21,7 +21,9 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsMcGen.h" diff --git a/PWGHF/TableProducer/candidateCreatorB0.cxx b/PWGHF/TableProducer/candidateCreatorB0.cxx index 5097623643f..43eb30d0f78 100644 --- a/PWGHF/TableProducer/candidateCreatorB0.cxx +++ b/PWGHF/TableProducer/candidateCreatorB0.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" diff --git a/PWGHF/TableProducer/candidateCreatorBplus.cxx b/PWGHF/TableProducer/candidateCreatorBplus.cxx index 8dcefe55c9c..70ea93867a5 100644 --- a/PWGHF/TableProducer/candidateCreatorBplus.cxx +++ b/PWGHF/TableProducer/candidateCreatorBplus.cxx @@ -21,8 +21,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsMcGen.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/TableProducer/candidateCreatorBs.cxx b/PWGHF/TableProducer/candidateCreatorBs.cxx index 41c41d7dcaa..d311135c367 100644 --- a/PWGHF/TableProducer/candidateCreatorBs.cxx +++ b/PWGHF/TableProducer/candidateCreatorBs.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" diff --git a/PWGHF/TableProducer/candidateCreatorCascade.cxx b/PWGHF/TableProducer/candidateCreatorCascade.cxx index 781b50c3412..e8a8613aacf 100644 --- a/PWGHF/TableProducer/candidateCreatorCascade.cxx +++ b/PWGHF/TableProducer/candidateCreatorCascade.cxx @@ -16,7 +16,9 @@ /// Paul Buehler, , Vienna #include "PWGHF/Core/CentralityEstimation.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/TableProducer/candidateCreatorDstar.cxx b/PWGHF/TableProducer/candidateCreatorDstar.cxx index 47a05c41c37..dd36c4122af 100644 --- a/PWGHF/TableProducer/candidateCreatorDstar.cxx +++ b/PWGHF/TableProducer/candidateCreatorDstar.cxx @@ -18,7 +18,9 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsPid.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/TableProducer/candidateCreatorLb.cxx b/PWGHF/TableProducer/candidateCreatorLb.cxx index b3fcad95b9b..5157be71213 100644 --- a/PWGHF/TableProducer/candidateCreatorLb.cxx +++ b/PWGHF/TableProducer/candidateCreatorLb.cxx @@ -17,8 +17,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsTrkCandHf.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx index b95b69e4937..27fbf053b3a 100644 --- a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx +++ b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx @@ -17,10 +17,13 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" // for dca recalculation #include "PWGHF/Utils/utilsEvSelHf.h" diff --git a/PWGHF/TableProducer/candidateCreatorSigmac0plusplusCascade.cxx b/PWGHF/TableProducer/candidateCreatorSigmac0plusplusCascade.cxx index c63bbf09ce4..fa952bf6b91 100644 --- a/PWGHF/TableProducer/candidateCreatorSigmac0plusplusCascade.cxx +++ b/PWGHF/TableProducer/candidateCreatorSigmac0plusplusCascade.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx b/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx index f658e183b10..eeda0ec5eca 100644 --- a/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx +++ b/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx @@ -19,10 +19,13 @@ #ifndef HomogeneousField #define HomogeneousField // o2-linter: disable=name/macro (required by KFParticle) +#include "PWGHF/Core/DecayChannelsLegacy.h" #endif #include "PWGHF/Core/CentralityEstimation.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx b/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx index 6a183d21c2f..ce5922219ed 100644 --- a/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx +++ b/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx @@ -19,10 +19,13 @@ #ifndef HomogeneousField #define HomogeneousField // o2-linter: disable=name/macro (required by KFParticle) +#include "PWGHF/Core/DecayChannelsLegacy.h" #endif #include "PWGHF/Core/CentralityEstimation.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/PWGHF/TableProducer/candidateCreatorXicc.cxx b/PWGHF/TableProducer/candidateCreatorXicc.cxx index 1d8058d09cb..2b7a231e596 100644 --- a/PWGHF/TableProducer/candidateCreatorXicc.cxx +++ b/PWGHF/TableProducer/candidateCreatorXicc.cxx @@ -17,9 +17,12 @@ /// \author Luigi Dello Stritto , SALERNO /// \author Mattia Faggin , University and INFN PADOVA +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/trackUtilities.h" diff --git a/PWGHF/TableProducer/candidateSelectorB0ToDPi.cxx b/PWGHF/TableProducer/candidateSelectorB0ToDPi.cxx index dfcd47e3e1a..962e935fc23 100644 --- a/PWGHF/TableProducer/candidateSelectorB0ToDPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorB0ToDPi.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseB0ToDPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsPid.h" diff --git a/PWGHF/TableProducer/candidateSelectorBplusToD0Pi.cxx b/PWGHF/TableProducer/candidateSelectorBplusToD0Pi.cxx index 0a8e6503230..9e2fac80961 100644 --- a/PWGHF/TableProducer/candidateSelectorBplusToD0Pi.cxx +++ b/PWGHF/TableProducer/candidateSelectorBplusToD0Pi.cxx @@ -19,6 +19,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseBplusToD0Pi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsPid.h" diff --git a/PWGHF/TableProducer/candidateSelectorBsToDsPi.cxx b/PWGHF/TableProducer/candidateSelectorBsToDsPi.cxx index 5e66076e670..60cef9d1777 100644 --- a/PWGHF/TableProducer/candidateSelectorBsToDsPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorBsToDsPi.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponse.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/candidateSelectorCd.cxx b/PWGHF/TableProducer/candidateSelectorCd.cxx index b220bc130b8..2fa2f49a140 100644 --- a/PWGHF/TableProducer/candidateSelectorCd.cxx +++ b/PWGHF/TableProducer/candidateSelectorCd.cxx @@ -16,8 +16,10 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorD0.cxx b/PWGHF/TableProducer/candidateSelectorD0.cxx index 48344fb7fa1..bd439da2f41 100644 --- a/PWGHF/TableProducer/candidateSelectorD0.cxx +++ b/PWGHF/TableProducer/candidateSelectorD0.cxx @@ -18,8 +18,10 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseD0ToKPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx b/PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx index 1cb7e8d9a59..42803cc5aa5 100644 --- a/PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx @@ -18,8 +18,10 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseDplusToPiKPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx b/PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx index 5f1f534cc27..3826643b598 100644 --- a/PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx @@ -18,8 +18,10 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseDsToKKPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx b/PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx index ae30c15f231..c61788f99d4 100644 --- a/PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx +++ b/PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx @@ -18,8 +18,10 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseDstarToD0Pi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorLbToLcPi.cxx b/PWGHF/TableProducer/candidateSelectorLbToLcPi.cxx index f698e250b27..ec416564365 100644 --- a/PWGHF/TableProducer/candidateSelectorLbToLcPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorLbToLcPi.cxx @@ -16,6 +16,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/candidateSelectorLc.cxx b/PWGHF/TableProducer/candidateSelectorLc.cxx index 25a4ede94d3..8c009cefb84 100644 --- a/PWGHF/TableProducer/candidateSelectorLc.cxx +++ b/PWGHF/TableProducer/candidateSelectorLc.cxx @@ -20,8 +20,10 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseLcToPKPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/TrackSelectorPID.h" #include "Common/DataModel/PIDResponseCombined.h" diff --git a/PWGHF/TableProducer/candidateSelectorLcPidMl.cxx b/PWGHF/TableProducer/candidateSelectorLcPidMl.cxx index ce791afe7b1..2d2abe0bf06 100644 --- a/PWGHF/TableProducer/candidateSelectorLcPidMl.cxx +++ b/PWGHF/TableProducer/candidateSelectorLcPidMl.cxx @@ -18,8 +18,10 @@ /// \author Maja Kabus , CERN, Warsaw University of Technology #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorLcToK0sP.cxx b/PWGHF/TableProducer/candidateSelectorLcToK0sP.cxx index ae017847cf4..c405b68b846 100644 --- a/PWGHF/TableProducer/candidateSelectorLcToK0sP.cxx +++ b/PWGHF/TableProducer/candidateSelectorLcToK0sP.cxx @@ -20,6 +20,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseLcToK0sP.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaKa.cxx b/PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaKa.cxx index 0f514d9aa05..44cb77e44a3 100644 --- a/PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaKa.cxx +++ b/PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaKa.cxx @@ -13,6 +13,7 @@ /// \brief Omegac0 → Omega Ka selection task /// \author Federica Zanone , Heidelberg University +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPi.cxx b/PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPi.cxx index d05c87196be..87856e1554a 100644 --- a/PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPi.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/HfMlResponseOmegacToOmegaPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/TableProducer/candidateSelectorOmegac0Xic0ToOmegaKa.cxx b/PWGHF/TableProducer/candidateSelectorOmegac0Xic0ToOmegaKa.cxx index 6e716cb1c91..e1e32120543 100644 --- a/PWGHF/TableProducer/candidateSelectorOmegac0Xic0ToOmegaKa.cxx +++ b/PWGHF/TableProducer/candidateSelectorOmegac0Xic0ToOmegaKa.cxx @@ -40,6 +40,7 @@ #include // #include "PWGHF/Core/HfMlResponseOmegaKaToOmegaKa.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/TableProducer/candidateSelectorToXiPi.cxx b/PWGHF/TableProducer/candidateSelectorToXiPi.cxx index d9064b61a29..84a6cfac6b3 100644 --- a/PWGHF/TableProducer/candidateSelectorToXiPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorToXiPi.cxx @@ -16,6 +16,7 @@ #include "PWGHF/Core/HfMlResponseXic0ToXiPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/TableProducer/candidateSelectorXic0ToXiPiKf.cxx b/PWGHF/TableProducer/candidateSelectorXic0ToXiPiKf.cxx index 13e131bbcfb..69d2a73339b 100644 --- a/PWGHF/TableProducer/candidateSelectorXic0ToXiPiKf.cxx +++ b/PWGHF/TableProducer/candidateSelectorXic0ToXiPiKf.cxx @@ -16,6 +16,7 @@ #include "PWGHF/Core/HfMlResponseXic0ToXiPiKf.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx b/PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx index cf6593c7c66..e755ef656b5 100644 --- a/PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx @@ -20,8 +20,10 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/HfMlResponseXicToPKPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorXicToXiPiPi.cxx b/PWGHF/TableProducer/candidateSelectorXicToXiPiPi.cxx index 223d484d0a1..6355024ec2b 100644 --- a/PWGHF/TableProducer/candidateSelectorXicToXiPiPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorXicToXiPiPi.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/HfMlResponseXicToXiPiPi.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx b/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx index 24057d1e59b..a9b14118da5 100644 --- a/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx @@ -14,8 +14,10 @@ /// /// \author Gian Michele Innocenti , CERN +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/converterDstarIndices.cxx b/PWGHF/TableProducer/converterDstarIndices.cxx index 8b26f94610e..a449f6542a6 100644 --- a/PWGHF/TableProducer/converterDstarIndices.cxx +++ b/PWGHF/TableProducer/converterDstarIndices.cxx @@ -14,7 +14,7 @@ /// /// \author Fabrizio Grosa , CERN -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include #include diff --git a/PWGHF/TableProducer/derivedDataCreatorB0ToDPi.cxx b/PWGHF/TableProducer/derivedDataCreatorB0ToDPi.cxx index 862e3da3d38..2c4b186991c 100644 --- a/PWGHF/TableProducer/derivedDataCreatorB0ToDPi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorB0ToDPi.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" diff --git a/PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx b/PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx index 6e33f7b4f1d..c75265a3161 100644 --- a/PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" diff --git a/PWGHF/TableProducer/derivedDataCreatorDplusToPiKPi.cxx b/PWGHF/TableProducer/derivedDataCreatorDplusToPiKPi.cxx index c8bf7a1ee3b..be6b8c11d7c 100644 --- a/PWGHF/TableProducer/derivedDataCreatorDplusToPiKPi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorDplusToPiKPi.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" diff --git a/PWGHF/TableProducer/derivedDataCreatorDsToKKPi.cxx b/PWGHF/TableProducer/derivedDataCreatorDsToKKPi.cxx index 5eb404e57ab..a9097f4457c 100644 --- a/PWGHF/TableProducer/derivedDataCreatorDsToKKPi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorDsToKKPi.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" diff --git a/PWGHF/TableProducer/derivedDataCreatorDstarToD0Pi.cxx b/PWGHF/TableProducer/derivedDataCreatorDstarToD0Pi.cxx index dfbfce30e68..1a15c3b1fb3 100644 --- a/PWGHF/TableProducer/derivedDataCreatorDstarToD0Pi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorDstarToD0Pi.cxx @@ -16,6 +16,7 @@ /// \author Mingze Li , CCNU #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" diff --git a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx index 86688ca2bb5..691f65a3092 100644 --- a/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" diff --git a/PWGHF/TableProducer/derivedDataCreatorXicToXiPiPi.cxx b/PWGHF/TableProducer/derivedDataCreatorXicToXiPiPi.cxx index 6dc0fac79d3..cd1a5ec4c42 100644 --- a/PWGHF/TableProducer/derivedDataCreatorXicToXiPiPi.cxx +++ b/PWGHF/TableProducer/derivedDataCreatorXicToXiPiPi.cxx @@ -15,7 +15,9 @@ /// /// \author Vít Kučera , Inha University +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/DataModel/DerivedTables.h" diff --git a/PWGHF/TableProducer/pidCreator.cxx b/PWGHF/TableProducer/pidCreator.cxx index e914c4f1c38..b74673fe4c4 100644 --- a/PWGHF/TableProducer/pidCreator.cxx +++ b/PWGHF/TableProducer/pidCreator.cxx @@ -14,6 +14,7 @@ /// /// \author Vít Kučera , Inha University +#include "PWGHF/DataModel/AliasTables.h" // IWYU pragma: keep #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "Common/Core/TableHelper.h" diff --git a/PWGHF/TableProducer/refitPvDummy.cxx b/PWGHF/TableProducer/refitPvDummy.cxx index 51b7db06236..783747b8b72 100644 --- a/PWGHF/TableProducer/refitPvDummy.cxx +++ b/PWGHF/TableProducer/refitPvDummy.cxx @@ -14,7 +14,7 @@ /// /// \author Mattia Faggin , University and INFN Padova, Italy -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/trackUtilities.h" diff --git a/PWGHF/TableProducer/trackIndexSkimCreator.cxx b/PWGHF/TableProducer/trackIndexSkimCreator.cxx index f556be3170e..4330d371444 100644 --- a/PWGHF/TableProducer/trackIndexSkimCreator.cxx +++ b/PWGHF/TableProducer/trackIndexSkimCreator.cxx @@ -23,7 +23,8 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/SelectorCuts.h" -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/AliasTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" diff --git a/PWGHF/TableProducer/treeCreatorB0ToDPi.cxx b/PWGHF/TableProducer/treeCreatorB0ToDPi.cxx index b354d7e5595..bfd6b275b3f 100644 --- a/PWGHF/TableProducer/treeCreatorB0ToDPi.cxx +++ b/PWGHF/TableProducer/treeCreatorB0ToDPi.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx index a0e7b2a3597..4c5beb985c2 100644 --- a/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx +++ b/PWGHF/TableProducer/treeCreatorBplusToD0Pi.cxx @@ -19,6 +19,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorBsToDsPi.cxx b/PWGHF/TableProducer/treeCreatorBsToDsPi.cxx index 594aae65cd1..c99fa0752e2 100644 --- a/PWGHF/TableProducer/treeCreatorBsToDsPi.cxx +++ b/PWGHF/TableProducer/treeCreatorBsToDsPi.cxx @@ -18,6 +18,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx b/PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx index dcee30bf93b..f706b1049f1 100644 --- a/PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx @@ -19,6 +19,7 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorDsToKKPi.cxx b/PWGHF/TableProducer/treeCreatorDsToKKPi.cxx index a68b673f732..4c8fac390e4 100644 --- a/PWGHF/TableProducer/treeCreatorDsToKKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorDsToKKPi.cxx @@ -20,6 +20,7 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorDstarToD0Pi.cxx b/PWGHF/TableProducer/treeCreatorDstarToD0Pi.cxx index f7055dfa8d0..059c3ed8f11 100644 --- a/PWGHF/TableProducer/treeCreatorDstarToD0Pi.cxx +++ b/PWGHF/TableProducer/treeCreatorDstarToD0Pi.cxx @@ -17,6 +17,7 @@ /// \author Fabrizio Grosa , CERN #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorLcToK0sP.cxx b/PWGHF/TableProducer/treeCreatorLcToK0sP.cxx index d80e3729507..4c63d4c7a78 100644 --- a/PWGHF/TableProducer/treeCreatorLcToK0sP.cxx +++ b/PWGHF/TableProducer/treeCreatorLcToK0sP.cxx @@ -18,6 +18,7 @@ /// \author Daniel Samitz #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx index 7bc710c8a9e..5266a5bf2fc 100644 --- a/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx +++ b/PWGHF/TableProducer/treeCreatorLcToPKPi.cxx @@ -19,6 +19,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx b/PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx index 2bb41833fc0..e6f7a69c08c 100644 --- a/PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx +++ b/PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx @@ -21,6 +21,7 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGLF/DataModel/mcCentrality.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGHF/TableProducer/treeCreatorOmegacSt.cxx b/PWGHF/TableProducer/treeCreatorOmegacSt.cxx index d4b76a1b631..31ee87f772b 100644 --- a/PWGHF/TableProducer/treeCreatorOmegacSt.cxx +++ b/PWGHF/TableProducer/treeCreatorOmegacSt.cxx @@ -15,7 +15,7 @@ /// \author Jochen Klein /// \author Tiantian Cheng -#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsTrkCandHf.h" #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/PWGHF/TableProducer/treeCreatorSigmacCorrBkg.cxx b/PWGHF/TableProducer/treeCreatorSigmacCorrBkg.cxx index 9a4cec7ef9e..6b02cd1ae1c 100644 --- a/PWGHF/TableProducer/treeCreatorSigmacCorrBkg.cxx +++ b/PWGHF/TableProducer/treeCreatorSigmacCorrBkg.cxx @@ -17,8 +17,10 @@ /// \author Mattia Faggin , INFN PADOVA #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/D2H/Utils/utilsSigmac.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorTccToD0D0Pi.cxx b/PWGHF/TableProducer/treeCreatorTccToD0D0Pi.cxx index 2791be74e04..1c63cdae324 100644 --- a/PWGHF/TableProducer/treeCreatorTccToD0D0Pi.cxx +++ b/PWGHF/TableProducer/treeCreatorTccToD0D0Pi.cxx @@ -16,6 +16,7 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" diff --git a/PWGHF/TableProducer/treeCreatorXicToXiPiPi.cxx b/PWGHF/TableProducer/treeCreatorXicToXiPiPi.cxx index 8cd92bef0c5..3d0500c3690 100644 --- a/PWGHF/TableProducer/treeCreatorXicToXiPiPi.cxx +++ b/PWGHF/TableProducer/treeCreatorXicToXiPiPi.cxx @@ -16,6 +16,7 @@ /// \author Carolina Reetz , Heidelberg University /// \author Jaeyoon Cho , Inha University +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx b/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx index 9e4f0e3703c..c1d80813554 100644 --- a/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx +++ b/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx @@ -17,6 +17,7 @@ /// /// \author Jinjoo Seo , Inha University +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/Tasks/taskLcCentrality.cxx b/PWGHF/Tasks/taskLcCentrality.cxx index 96d4c03c2f3..4401b58e44c 100644 --- a/PWGHF/Tasks/taskLcCentrality.cxx +++ b/PWGHF/Tasks/taskLcCentrality.cxx @@ -19,8 +19,10 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/DataModel/Centrality.h" diff --git a/PWGHF/Tasks/taskMcEfficiency.cxx b/PWGHF/Tasks/taskMcEfficiency.cxx index b4d17250c8f..3afee0779d0 100644 --- a/PWGHF/Tasks/taskMcEfficiency.cxx +++ b/PWGHF/Tasks/taskMcEfficiency.cxx @@ -17,6 +17,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/DataModel/TrackSelectionTables.h" diff --git a/PWGHF/Tasks/taskMcEfficiencyToXiPi.cxx b/PWGHF/Tasks/taskMcEfficiencyToXiPi.cxx index 78398ae2ec0..4ac10b7c538 100644 --- a/PWGHF/Tasks/taskMcEfficiencyToXiPi.cxx +++ b/PWGHF/Tasks/taskMcEfficiencyToXiPi.cxx @@ -14,6 +14,7 @@ /// /// \author Federica Zanone, Heidelberg University +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/Tasks/taskMcValidation.cxx b/PWGHF/Tasks/taskMcValidation.cxx index a2cdaf659eb..c2bd1f0a12b 100644 --- a/PWGHF/Tasks/taskMcValidation.cxx +++ b/PWGHF/Tasks/taskMcValidation.cxx @@ -20,7 +20,9 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGLF/DataModel/mcCentrality.h" diff --git a/PWGHF/Tasks/taskSelOptimisation.cxx b/PWGHF/Tasks/taskSelOptimisation.cxx index 77fae9bf1e0..15787a42a6e 100644 --- a/PWGHF/Tasks/taskSelOptimisation.cxx +++ b/PWGHF/Tasks/taskSelOptimisation.cxx @@ -14,7 +14,9 @@ /// /// \author Fabrizio Grosa , CERN +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateSkimmingTables.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGJE/Core/JetHFUtilities.h b/PWGJE/Core/JetHFUtilities.h index 6e25d808d37..796285757bf 100644 --- a/PWGJE/Core/JetHFUtilities.h +++ b/PWGJE/Core/JetHFUtilities.h @@ -18,6 +18,7 @@ #define PWGJE_CORE_JETHFUTILITIES_H_ #include "PWGHF/Core/DecayChannels.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGJE/DataModel/Jet.h" #include From 9286b57016d3d8b4abce6102aa562d0b3c6c8300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Thu, 23 Oct 2025 14:34:41 +0200 Subject: [PATCH 08/13] Move legacy decay flags in DecayChannelsLegacy.h --- PWGHF/Core/DecayChannelsLegacy.h | 119 +++++++++++++++++++ PWGHF/DataModel/CandidateSkimmingTables.h | 134 +++++----------------- 2 files changed, 150 insertions(+), 103 deletions(-) create mode 100644 PWGHF/Core/DecayChannelsLegacy.h diff --git a/PWGHF/Core/DecayChannelsLegacy.h b/PWGHF/Core/DecayChannelsLegacy.h new file mode 100644 index 00000000000..703ed43987c --- /dev/null +++ b/PWGHF/Core/DecayChannelsLegacy.h @@ -0,0 +1,119 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// \file DecayChannelsLegacy.h +/// \brief Legacy definitions of constants for MC flagging of HF decay channels. +/// \author Vít Kučera , Inha University +/// \note Should be replaced with corresponding constants in DecayChannels.h. + +#ifndef PWGHF_CORE_DECAYCHANNELSLEGACY_H_ +#define PWGHF_CORE_DECAYCHANNELSLEGACY_H_ + +namespace o2::aod +{ +namespace hf_cand_xic0_omegac0 +{ +enum DecayType { + XiczeroToXiPi = 0, + OmegaczeroToXiPi, + OmegaczeroToOmegaPi, + OmegaczeroToOmegaK, + OmegaczeroToOmegaPiOneMu +}; +} // namespace hf_cand_xic0_omegac0 + +namespace hf_cand_xic_to_xi_pi_pi +{ +enum DecayType { + XicToXiPiPi = 0, // Ξc± → Ξ∓ π± π± + XicToXiResPiToXiPiPi, // Ξc± → Ξ(1530) π± → Ξ∓ π± π± + NDecayType +}; +} // namespace hf_cand_xic_to_xi_pi_pi + +namespace hf_cand_dstar +{ +enum DecayType { + DstarToD0Pi = 0, + D0ToPiK, + DstarToD0PiPi0, + D0ToPiKPi0, + NDstarDecayType +}; +} // namespace hf_cand_dstar + +namespace hf_cand_sigmac +{ +enum DecayType { + Sc0ToPKPiPi = 0, + ScplusplusToPKPiPi, + ScStar0ToPKPiPi, + ScStarPlusPlusToPKPiPi +}; +} // namespace hf_cand_sigmac + +namespace hf_cand_b0 +{ +enum DecayType { + B0ToDPi = 0, + B0ToDstarPi +}; +} // namespace hf_cand_b0 + +namespace hf_cand_bplus +{ +enum DecayType { + BplusToD0Pi = 0 +}; +} // namespace hf_cand_bplus + +namespace hf_cand_bs +{ +enum DecayType { + BsToDsPi = 0 +}; +} // namespace hf_cand_bs + +namespace hf_cand_lb +{ +enum DecayType { + LbToLcPi +}; +} // namespace hf_cand_lb + +// ALICE3 + +namespace hf_cand_x +{ +enum DecayType { + XToJpsiToEEPiPi = 0, + XToJpsiToMuMuPiPi +}; +} // namespace hf_cand_x + +namespace hf_cand_xicc +{ +enum DecayType { + XiccToXicPi = 0 +}; +} // namespace hf_cand_xicc + +namespace hf_cand_chic +{ +enum DecayType { + ChicToJpsiToEEGamma = 0, + ChicToJpsiToMuMuGamma +}; +} // namespace hf_cand_chic + +} // namespace o2::aod + +#endif // PWGHF_CORE_DECAYCHANNELSLEGACY_H_ diff --git a/PWGHF/DataModel/CandidateSkimmingTables.h b/PWGHF/DataModel/CandidateSkimmingTables.h index 95cf10751dd..9013170a668 100644 --- a/PWGHF/DataModel/CandidateSkimmingTables.h +++ b/PWGHF/DataModel/CandidateSkimmingTables.h @@ -30,12 +30,21 @@ namespace o2::aod { namespace hf_sel_collision { + +// ================ +// Collision selection table +// ================ + DECLARE_SOA_COLUMN(WhyRejectColl, whyRejectColl, o2::hf_evsel::HfCollisionRejectionMask); //! } // namespace hf_sel_collision DECLARE_SOA_TABLE(HfSelCollision, "AOD", "HFSELCOLLISION", //! hf_sel_collision::WhyRejectColl); +// ================ +// Track selection tables +// ================ + namespace hf_sel_track { DECLARE_SOA_COLUMN(IsSelProng, isSelProng, uint32_t); //! @@ -76,6 +85,10 @@ DECLARE_SOA_TABLE(HfPvRefitTrack, "AOD", "HFPVREFITTRACK", //! hf_pv_refit_track::PvRefitDcaXY, hf_pv_refit_track::PvRefitDcaZ); +// ================ +// Track index skim tables +// ================ + namespace hf_track_index { DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index @@ -88,16 +101,14 @@ DECLARE_SOA_INDEX_COLUMN(V0, v0); //! Index to V DECLARE_SOA_INDEX_COLUMN(Cascade, cascade); //! Index to cascade prong DECLARE_SOA_COLUMN(HFflag, hfflag, uint8_t); //! Bitmap to store selection results, o2-linter: disable=name/o2-column (written to disk) -DECLARE_SOA_COLUMN(FlagD0ToKPi, flagD0ToKPi, uint8_t); //! -DECLARE_SOA_COLUMN(FlagJpsiToEE, flagJpsiToEE, uint8_t); //! -DECLARE_SOA_COLUMN(FlagJpsiToMuMu, flagJpsiToMuMu, uint8_t); //! - +DECLARE_SOA_COLUMN(FlagD0ToKPi, flagD0ToKPi, uint8_t); //! +DECLARE_SOA_COLUMN(FlagJpsiToEE, flagJpsiToEE, uint8_t); //! +DECLARE_SOA_COLUMN(FlagJpsiToMuMu, flagJpsiToMuMu, uint8_t); //! DECLARE_SOA_COLUMN(FlagDplusToPiKPi, flagDplusToPiKPi, uint8_t); //! DECLARE_SOA_COLUMN(FlagLcToPKPi, flagLcToPKPi, uint8_t); //! DECLARE_SOA_COLUMN(FlagDsToKKPi, flagDsToKKPi, uint8_t); //! DECLARE_SOA_COLUMN(FlagXicToPKPi, flagXicToPKPi, uint8_t); //! - -DECLARE_SOA_COLUMN(FlagDstarToD0Pi, flagDstarToD0Pi, uint8_t); //! +DECLARE_SOA_COLUMN(FlagDstarToD0Pi, flagDstarToD0Pi, uint8_t); //! DECLARE_SOA_COLUMN(MlProbSkimD0ToKPi, mlProbSkimD0ToKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for D0->Kpi DECLARE_SOA_COLUMN(MlProbSkimDplusToPiKPi, mlProbSkimDplusToPiKPi, std::vector); //! ML probabilities (background, prompt, non-prompt) for D+->Kpipi @@ -160,6 +171,7 @@ DECLARE_SOA_TABLE(HfCascLf2Prongs, "AOD", "HFCASCLF2PRONG", //! Table for HF 2 p hf_track_index::CascadeId, hf_track_index::Prong0Id, hf_track_index::HFflag); + using HfCascLf2Prong = HfCascLf2Prongs::iterator; DECLARE_SOA_TABLE(HfCascLf3Prongs, "AOD", "HFCASCLF3PRONG", //! Table for HF 3 prong candidates with a Cascade @@ -168,6 +180,7 @@ DECLARE_SOA_TABLE(HfCascLf3Prongs, "AOD", "HFCASCLF3PRONG", //! Table for HF 3 p hf_track_index::CascadeId, hf_track_index::Prong0Id, hf_track_index::Prong1Id); + using HfCascLf3Prong = HfCascLf3Prongs::iterator; namespace hf_track_index @@ -212,6 +225,10 @@ DECLARE_SOA_TABLE(Hf3ProngMlProbs, "AOD", "HF3PRONGMLPROB", //! Table for ML sco hf_track_index::MlProbSkimDsToKKPi, hf_track_index::MlProbSkimXicToPKPi); +// ================ +// Primary-vertex refit tables +// ================ + namespace hf_pv_refit { DECLARE_SOA_COLUMN(PvRefitX, pvRefitX, float); //! @@ -260,6 +277,10 @@ DECLARE_SOA_TABLE(HfPvRefitDstar, "AOD", "HFPVREFITDSTAR", //! hf_pv_refit::PvRefitSigmaZ2, o2::soa::Marker<2>); +// ================ +// Decay types stored in HFflag +// ================ + namespace hf_cand_2prong { enum DecayType { @@ -267,15 +288,8 @@ enum DecayType { JpsiToEE, JpsiToMuMu, N2ProngDecays -}; // always keep N2ProngDecays at the end -} // namespace hf_cand_2prong - -namespace hf_cand_bplus -{ -enum DecayType { - BplusToD0Pi = 0 }; -} // namespace hf_cand_bplus +} // namespace hf_cand_2prong namespace hf_cand_3prong { @@ -286,94 +300,8 @@ enum DecayType { XicToPKPi, CdToDeKPi, N3ProngDecays -}; // always keep N3ProngDecays at the end -} // namespace hf_cand_3prong - -namespace hf_cand_x -{ -enum DecayType { - XToJpsiToEEPiPi = 0, - XToJpsiToMuMuPiPi -}; // move this to a dedicated cascade namespace in the future? -} // namespace hf_cand_x - -namespace hf_cand_xicc -{ -enum DecayType { - XiccToXicPi = 0 -}; // move this to a dedicated cascade namespace in the future? -} // namespace hf_cand_xicc - -namespace hf_cand_xic0_omegac0 -{ -enum DecayType { - XiczeroToXiPi = 0, - OmegaczeroToXiPi, - OmegaczeroToOmegaPi, - OmegaczeroToOmegaK, - OmegaczeroToOmegaPiOneMu -}; -} // namespace hf_cand_xic0_omegac0 - -namespace hf_cand_xic_to_xi_pi_pi -{ -enum DecayType { - XicToXiPiPi = 0, // Ξc± → Ξ∓ π± π± - XicToXiResPiToXiPiPi, // Ξc± → Ξ(1530) π± → Ξ∓ π± π± - NDecayType -}; -} // namespace hf_cand_xic_to_xi_pi_pi - -namespace hf_cand_chic -{ -enum DecayType { - ChicToJpsiToEEGamma = 0, - ChicToJpsiToMuMuGamma -}; // move this to a dedicated cascade namespace in the future? -} // namespace hf_cand_chic - -namespace hf_cand_lb -{ -enum DecayType { - LbToLcPi -}; // move this to a dedicated cascade namespace in the future? -} // namespace hf_cand_lb - -namespace hf_cand_b0 -{ -enum DecayType { - B0ToDPi = 0, - B0ToDstarPi -}; -} // namespace hf_cand_b0 - -namespace hf_cand_bs -{ -enum DecayType { - BsToDsPi = 0 -}; -} // namespace hf_cand_bs - -namespace hf_cand_sigmac -{ -enum DecayType { - Sc0ToPKPiPi = 0, - ScplusplusToPKPiPi, - ScStar0ToPKPiPi, - ScStarPlusPlusToPKPiPi }; -} // namespace hf_cand_sigmac - -namespace hf_cand_dstar -{ -enum DecayType { - DstarToD0Pi = 0, - D0ToPiK, - DstarToD0PiPi0, - D0ToPiKPi0, - NDstarDecayType -}; -} // namespace hf_cand_dstar +} // namespace hf_cand_3prong namespace hf_cand_casc_lf { @@ -382,12 +310,12 @@ enum DecayType2Prong { OmegaczeroToOmegaPi, OmegaczeroToOmegaK, N2ProngDecays -}; // always keep N2ProngDecays at the end +}; enum DecayType3Prong { XicplusToXiPiPi = 0, N3ProngDecays -}; // always keep N3ProngDecays at the end +}; } // namespace hf_cand_casc_lf } // namespace o2::aod From e24caf160d413fa4be3aa44126f0b849f6d31fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Thu, 23 Oct 2025 15:52:48 +0200 Subject: [PATCH 09/13] Move ALICE3 decay types to ALICE3/Core/DecayChannelsLegacy.h --- PWGHF/ALICE3/Core/DecayChannelsLegacy.h | 46 +++++++++++++++++++ PWGHF/Core/DecayChannelsLegacy.h | 25 ---------- PWGHF/D2H/Tasks/taskXicc.cxx | 2 +- PWGHF/TableProducer/candidateCreatorXicc.cxx | 2 +- .../candidateSelectorXiccToPKPiPi.cxx | 2 +- .../TableProducer/treeCreatorXiccToPKPiPi.cxx | 2 +- 6 files changed, 50 insertions(+), 29 deletions(-) create mode 100644 PWGHF/ALICE3/Core/DecayChannelsLegacy.h diff --git a/PWGHF/ALICE3/Core/DecayChannelsLegacy.h b/PWGHF/ALICE3/Core/DecayChannelsLegacy.h new file mode 100644 index 00000000000..7b95df102f1 --- /dev/null +++ b/PWGHF/ALICE3/Core/DecayChannelsLegacy.h @@ -0,0 +1,46 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// \file DecayChannelsLegacy.h +/// \brief Legacy definitions of constants for MC flagging of HF decay channels. +/// \author Vít Kučera , Inha University + +#ifndef PWGHF_ALICE3_CORE_DECAYCHANNELSLEGACY_H_ +#define PWGHF_ALICE3_CORE_DECAYCHANNELSLEGACY_H_ + +namespace o2::aod +{ +namespace hf_cand_x +{ +enum DecayType { + XToJpsiToEEPiPi = 0, + XToJpsiToMuMuPiPi +}; +} // namespace hf_cand_x + +namespace hf_cand_xicc +{ +enum DecayType { + XiccToXicPi = 0 +}; +} // namespace hf_cand_xicc + +namespace hf_cand_chic +{ +enum DecayType { + ChicToJpsiToEEGamma = 0, + ChicToJpsiToMuMuGamma +}; +} // namespace hf_cand_chic + +} // namespace o2::aod + +#endif // PWGHF_ALICE3_CORE_DECAYCHANNELSLEGACY_H_ diff --git a/PWGHF/Core/DecayChannelsLegacy.h b/PWGHF/Core/DecayChannelsLegacy.h index 703ed43987c..0dd3c8f0188 100644 --- a/PWGHF/Core/DecayChannelsLegacy.h +++ b/PWGHF/Core/DecayChannelsLegacy.h @@ -89,31 +89,6 @@ enum DecayType { }; } // namespace hf_cand_lb -// ALICE3 - -namespace hf_cand_x -{ -enum DecayType { - XToJpsiToEEPiPi = 0, - XToJpsiToMuMuPiPi -}; -} // namespace hf_cand_x - -namespace hf_cand_xicc -{ -enum DecayType { - XiccToXicPi = 0 -}; -} // namespace hf_cand_xicc - -namespace hf_cand_chic -{ -enum DecayType { - ChicToJpsiToEEGamma = 0, - ChicToJpsiToMuMuGamma -}; -} // namespace hf_cand_chic - } // namespace o2::aod #endif // PWGHF_CORE_DECAYCHANNELSLEGACY_H_ diff --git a/PWGHF/D2H/Tasks/taskXicc.cxx b/PWGHF/D2H/Tasks/taskXicc.cxx index b44b4e9365e..35e18de7ba5 100644 --- a/PWGHF/D2H/Tasks/taskXicc.cxx +++ b/PWGHF/D2H/Tasks/taskXicc.cxx @@ -16,7 +16,7 @@ /// \author Gian Michele Innocenti , CERN /// \author Jinjoo Seo , Inha University -#include "PWGHF/Core/DecayChannelsLegacy.h" +#include "PWGHF/ALICE3/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/AliasTables.h" diff --git a/PWGHF/TableProducer/candidateCreatorXicc.cxx b/PWGHF/TableProducer/candidateCreatorXicc.cxx index 2b7a231e596..e055e956a59 100644 --- a/PWGHF/TableProducer/candidateCreatorXicc.cxx +++ b/PWGHF/TableProducer/candidateCreatorXicc.cxx @@ -17,7 +17,7 @@ /// \author Luigi Dello Stritto , SALERNO /// \author Mattia Faggin , University and INFN PADOVA -#include "PWGHF/Core/DecayChannelsLegacy.h" +#include "PWGHF/ALICE3/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" diff --git a/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx b/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx index a9b14118da5..032dd658f95 100644 --- a/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorXiccToPKPiPi.cxx @@ -14,7 +14,7 @@ /// /// \author Gian Michele Innocenti , CERN -#include "PWGHF/Core/DecayChannelsLegacy.h" +#include "PWGHF/ALICE3/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/AliasTables.h" diff --git a/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx b/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx index c1d80813554..5307d3bfa7b 100644 --- a/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx +++ b/PWGHF/TableProducer/treeCreatorXiccToPKPiPi.cxx @@ -17,7 +17,7 @@ /// /// \author Jinjoo Seo , Inha University -#include "PWGHF/Core/DecayChannelsLegacy.h" +#include "PWGHF/ALICE3/Core/DecayChannelsLegacy.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" From 91050868ead8e39dbde0a32ce513edcf7a3ac2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Thu, 23 Oct 2025 16:48:59 +0200 Subject: [PATCH 10/13] Fix docs --- PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx | 2 +- PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx b/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx index 761ff73715a..ee1db8c6522 100644 --- a/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx +++ b/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx @@ -9,7 +9,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file HFCorrelatorD0D0barBarrelFullPid.cxx +/// \file correlatorD0D0barBarrelFullPid.cxx /// \brief Temporary D0-D0bar correlator task with full barrel PID implementation - data-like, MC-reco and MC-kine analyses. For ULS and LS pairs /// /// \author Fabio Colamaria , INFN Bari diff --git a/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx b/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx index 13af748d85e..feeb0faa729 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx @@ -9,7 +9,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file HfCorrelatorDplusDminus.cxx +/// \file correlatorDplusDminus.cxx /// \brief Dplus-Dminus correlator task - data-like, MC-reco and MC-kine analyses. For ULS and LS pairs /// /// \author Fabio Colamaria , INFN Bari From c267fb2e98bc5d12b8cec3f566ed4d1a846aac32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Thu, 23 Oct 2025 16:54:29 +0200 Subject: [PATCH 11/13] Change doc comment --- PWGHF/DataModel/CandidateSkimmingTables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/DataModel/CandidateSkimmingTables.h b/PWGHF/DataModel/CandidateSkimmingTables.h index 9013170a668..eebc92c6f5c 100644 --- a/PWGHF/DataModel/CandidateSkimmingTables.h +++ b/PWGHF/DataModel/CandidateSkimmingTables.h @@ -10,7 +10,7 @@ // or submit itself to any jurisdiction. /// \file CandidateSkimmingTables.h -/// \brief Definitions of tables produced by candidate skimming workflows +/// \brief Definitions of tables produced by the candidate skimming /// /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN From bdf0523510c0819ef0bee1f2721f4b199f4ffc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Thu, 23 Oct 2025 16:58:03 +0200 Subject: [PATCH 12/13] Fix include position --- PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx | 2 +- PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx b/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx index eeda0ec5eca..3671030694a 100644 --- a/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx +++ b/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx @@ -19,10 +19,10 @@ #ifndef HomogeneousField #define HomogeneousField // o2-linter: disable=name/macro (required by KFParticle) -#include "PWGHF/Core/DecayChannelsLegacy.h" #endif #include "PWGHF/Core/CentralityEstimation.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSkimmingTables.h" diff --git a/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx b/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx index ce5922219ed..167a8cff0fe 100644 --- a/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx +++ b/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx @@ -19,10 +19,10 @@ #ifndef HomogeneousField #define HomogeneousField // o2-linter: disable=name/macro (required by KFParticle) -#include "PWGHF/Core/DecayChannelsLegacy.h" #endif #include "PWGHF/Core/CentralityEstimation.h" +#include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSkimmingTables.h" From 2935b7cc400ace1769cc48983715a8ec1bb0f791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Mon, 27 Oct 2025 18:05:02 +0100 Subject: [PATCH 13/13] Rename CandidateSkimmingTables.h to TrackIndexSkimmingTables.h --- EventFiltering/PWGHF/HFFilter.cxx | 2 +- EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx | 2 +- EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx | 2 +- PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx | 2 +- PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx | 2 +- PWGHF/D2H/Tasks/taskCd.cxx | 2 +- PWGHF/D2H/Tasks/taskD0.cxx | 2 +- PWGHF/D2H/Tasks/taskDplus.cxx | 2 +- PWGHF/D2H/Tasks/taskDs.cxx | 2 +- PWGHF/D2H/Tasks/taskLc.cxx | 2 +- PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx | 2 +- PWGHF/D2H/Tasks/taskXic.cxx | 2 +- PWGHF/DataModel/CandidateReconstructionTables.h | 2 +- PWGHF/DataModel/DerivedTables.h | 2 +- ...ndidateSkimmingTables.h => TrackIndexSkimmingTables.h} | 8 ++++---- PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx | 2 +- .../HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx | 2 +- PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx | 2 +- PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx | 2 +- PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx | 2 +- PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx | 2 +- PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx | 2 +- PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx | 2 +- PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx | 2 +- PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx | 2 +- PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx | 2 +- PWGHF/HFC/Tasks/taskFlow.cxx | 2 +- PWGHF/TableProducer/candidateCreator2Prong.cxx | 2 +- PWGHF/TableProducer/candidateCreator3Prong.cxx | 2 +- PWGHF/TableProducer/candidateCreatorBplus.cxx | 2 +- PWGHF/TableProducer/candidateCreatorCascade.cxx | 2 +- PWGHF/TableProducer/candidateCreatorDstar.cxx | 2 +- PWGHF/TableProducer/candidateCreatorLb.cxx | 2 +- PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx | 2 +- PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx | 2 +- PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx | 2 +- PWGHF/TableProducer/candidateCreatorXicc.cxx | 2 +- PWGHF/TableProducer/candidateSelectorCd.cxx | 2 +- PWGHF/TableProducer/candidateSelectorD0.cxx | 2 +- PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx | 2 +- PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx | 2 +- PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx | 2 +- PWGHF/TableProducer/candidateSelectorLc.cxx | 2 +- PWGHF/TableProducer/candidateSelectorLcPidMl.cxx | 2 +- PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx | 2 +- PWGHF/TableProducer/converterDstarIndices.cxx | 2 +- PWGHF/TableProducer/refitPvDummy.cxx | 2 +- PWGHF/TableProducer/trackIndexSkimCreator.cxx | 2 +- PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx | 2 +- PWGHF/TableProducer/treeCreatorOmegacSt.cxx | 2 +- PWGHF/Tasks/taskLcCentrality.cxx | 2 +- PWGHF/Tasks/taskMcEfficiency.cxx | 2 +- PWGHF/Tasks/taskMcValidation.cxx | 2 +- PWGHF/Tasks/taskSelOptimisation.cxx | 2 +- 54 files changed, 57 insertions(+), 57 deletions(-) rename PWGHF/DataModel/{CandidateSkimmingTables.h => TrackIndexSkimmingTables.h} (98%) diff --git a/EventFiltering/PWGHF/HFFilter.cxx b/EventFiltering/PWGHF/HFFilter.cxx index a78eb4f5fd9..bcf3b92a498 100644 --- a/EventFiltering/PWGHF/HFFilter.cxx +++ b/EventFiltering/PWGHF/HFFilter.cxx @@ -23,7 +23,7 @@ #include "EventFiltering/filterTables.h" // #include "PWGHF/Core/SelectorCuts.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" // #include "PWGEM/PhotonMeson/DataModel/gammaTables.h" #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx b/EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx index 00ba6b8d6d5..e136856c33e 100644 --- a/EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx +++ b/EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx @@ -17,7 +17,7 @@ #include "EventFiltering/PWGHF/HFFilterHelpers.h" // #include "PWGHF/Core/SelectorCuts.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" // #include "Common/CCDB/EventSelectionParams.h" #include "Common/Core/RecoDecay.h" diff --git a/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx b/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx index 66c362e0432..1b2db23c907 100644 --- a/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx +++ b/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx @@ -20,7 +20,7 @@ #include "EventFiltering/PWGHF/HFFilterHelpers.h" // -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" // #include "Common/Core/RecoDecay.h" #include "Common/Core/trackUtilities.h" diff --git a/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx index 448e3bf5e13..2604d089159 100644 --- a/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx +++ b/PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx @@ -27,7 +27,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx b/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx index 99110ef453c..88ef350c2b2 100644 --- a/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx +++ b/PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx @@ -24,7 +24,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/D2H/Tasks/taskCd.cxx b/PWGHF/D2H/Tasks/taskCd.cxx index cf4fc78d9fe..c9590739f5d 100644 --- a/PWGHF/D2H/Tasks/taskCd.cxx +++ b/PWGHF/D2H/Tasks/taskCd.cxx @@ -18,7 +18,7 @@ #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/DataModel/Centrality.h" #include "Common/DataModel/EventSelection.h" diff --git a/PWGHF/D2H/Tasks/taskD0.cxx b/PWGHF/D2H/Tasks/taskD0.cxx index 98fd34d18fb..c583b302dff 100644 --- a/PWGHF/D2H/Tasks/taskD0.cxx +++ b/PWGHF/D2H/Tasks/taskD0.cxx @@ -22,7 +22,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "Common/CCDB/ctpRateFetcher.h" diff --git a/PWGHF/D2H/Tasks/taskDplus.cxx b/PWGHF/D2H/Tasks/taskDplus.cxx index ef6f6be71b3..e3885fdceb2 100644 --- a/PWGHF/D2H/Tasks/taskDplus.cxx +++ b/PWGHF/D2H/Tasks/taskDplus.cxx @@ -23,7 +23,7 @@ #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "PWGHF/Utils/utilsEvSelHf.h" diff --git a/PWGHF/D2H/Tasks/taskDs.cxx b/PWGHF/D2H/Tasks/taskDs.cxx index 553cd63caaf..7c26c349a58 100644 --- a/PWGHF/D2H/Tasks/taskDs.cxx +++ b/PWGHF/D2H/Tasks/taskDs.cxx @@ -23,7 +23,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "PWGHF/Utils/utilsEvSelHf.h" diff --git a/PWGHF/D2H/Tasks/taskLc.cxx b/PWGHF/D2H/Tasks/taskLc.cxx index 9747c0f4213..7d608ba7e9b 100644 --- a/PWGHF/D2H/Tasks/taskLc.cxx +++ b/PWGHF/D2H/Tasks/taskLc.cxx @@ -27,7 +27,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGUD/Core/UPCHelpers.h" diff --git a/PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx b/PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx index c0b54e5d715..c96372c8b8d 100644 --- a/PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx +++ b/PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx @@ -19,7 +19,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGLF/DataModel/mcCentrality.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGHF/D2H/Tasks/taskXic.cxx b/PWGHF/D2H/Tasks/taskXic.cxx index 9d2d077f44e..cfe5c9d4b75 100644 --- a/PWGHF/D2H/Tasks/taskXic.cxx +++ b/PWGHF/D2H/Tasks/taskXic.cxx @@ -25,7 +25,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h index bf56c6c8550..5bc4cc45c1c 100644 --- a/PWGHF/DataModel/CandidateReconstructionTables.h +++ b/PWGHF/DataModel/CandidateReconstructionTables.h @@ -18,7 +18,7 @@ #ifndef PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ #define PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsPid.h" // #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/PWGHF/DataModel/DerivedTables.h b/PWGHF/DataModel/DerivedTables.h index 00170d567e2..3e9b374898a 100644 --- a/PWGHF/DataModel/DerivedTables.h +++ b/PWGHF/DataModel/DerivedTables.h @@ -17,7 +17,7 @@ #define PWGHF_DATAMODEL_DERIVEDTABLES_H_ #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/DataModel/Centrality.h" diff --git a/PWGHF/DataModel/CandidateSkimmingTables.h b/PWGHF/DataModel/TrackIndexSkimmingTables.h similarity index 98% rename from PWGHF/DataModel/CandidateSkimmingTables.h rename to PWGHF/DataModel/TrackIndexSkimmingTables.h index eebc92c6f5c..6408c636f8e 100644 --- a/PWGHF/DataModel/CandidateSkimmingTables.h +++ b/PWGHF/DataModel/TrackIndexSkimmingTables.h @@ -9,14 +9,14 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file CandidateSkimmingTables.h +/// \file TrackIndexSkimmingTables.h /// \brief Definitions of tables produced by the candidate skimming /// /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN -#ifndef PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_ -#define PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_ +#ifndef PWGHF_DATAMODEL_TRACKINDEXSKIMMINGTABLES_H_ +#define PWGHF_DATAMODEL_TRACKINDEXSKIMMINGTABLES_H_ #include "PWGHF/Utils/utilsEvSelHf.h" @@ -320,4 +320,4 @@ enum DecayType3Prong { } // namespace o2::aod -#endif // PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_ +#endif // PWGHF_DATAMODEL_TRACKINDEXSKIMMINGTABLES_H_ diff --git a/PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx b/PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx index e965ec6e735..b72ca63a212 100644 --- a/PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx +++ b/PWGHF/HFC/TableProducer/correlatorD0D0bar.cxx @@ -20,7 +20,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx b/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx index ee1db8c6522..7211c0152bd 100644 --- a/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx +++ b/PWGHF/HFC/TableProducer/correlatorD0D0barBarrelFullPid.cxx @@ -20,7 +20,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx b/PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx index f58bc0be497..a762603c5ae 100644 --- a/PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx @@ -21,7 +21,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx b/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx index feeb0faa729..bf4c1e2b2a3 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusDminus.cxx @@ -20,7 +20,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx index a6639ea791b..dc655e71a1b 100644 --- a/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx @@ -19,7 +19,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx index c4ebb6bba14..7dc4b7ab713 100644 --- a/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx @@ -20,7 +20,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" diff --git a/PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx index 0c75fb4e2f4..d8fef830ce9 100644 --- a/PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorLcHadrons.cxx @@ -22,7 +22,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx b/PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx index 125367cdcfe..61d5147b0b7 100644 --- a/PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx +++ b/PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx @@ -23,7 +23,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx index 147e65a1d0f..3a99678e5e3 100644 --- a/PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx +++ b/PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx @@ -19,7 +19,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx index 684bcade325..6b74767c2e6 100644 --- a/PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx +++ b/PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx @@ -20,7 +20,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx b/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx index 97234665446..c5b59d9bd39 100644 --- a/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx +++ b/PWGHF/HFC/Tasks/taskCorrelationLcHadrons.cxx @@ -20,7 +20,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/HFC/DataModel/CorrelationTables.h" #include "PWGHF/HFC/Utils/utilsCorrelations.h" #include "PWGHF/Utils/utilsAnalysis.h" diff --git a/PWGHF/HFC/Tasks/taskFlow.cxx b/PWGHF/HFC/Tasks/taskFlow.cxx index a4e15ff880b..0af4125c446 100644 --- a/PWGHF/HFC/Tasks/taskFlow.cxx +++ b/PWGHF/HFC/Tasks/taskFlow.cxx @@ -21,7 +21,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsPid.h" #include "PWGMM/Mult/DataModel/bestCollisionTable.h" diff --git a/PWGHF/TableProducer/candidateCreator2Prong.cxx b/PWGHF/TableProducer/candidateCreator2Prong.cxx index e56b8fb7f79..cd262ce388b 100644 --- a/PWGHF/TableProducer/candidateCreator2Prong.cxx +++ b/PWGHF/TableProducer/candidateCreator2Prong.cxx @@ -24,7 +24,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsMcGen.h" diff --git a/PWGHF/TableProducer/candidateCreator3Prong.cxx b/PWGHF/TableProducer/candidateCreator3Prong.cxx index 8b06342e997..379fd049474 100644 --- a/PWGHF/TableProducer/candidateCreator3Prong.cxx +++ b/PWGHF/TableProducer/candidateCreator3Prong.cxx @@ -23,7 +23,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsMcGen.h" diff --git a/PWGHF/TableProducer/candidateCreatorBplus.cxx b/PWGHF/TableProducer/candidateCreatorBplus.cxx index 70ea93867a5..e9d238165a3 100644 --- a/PWGHF/TableProducer/candidateCreatorBplus.cxx +++ b/PWGHF/TableProducer/candidateCreatorBplus.cxx @@ -24,7 +24,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsMcGen.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/TableProducer/candidateCreatorCascade.cxx b/PWGHF/TableProducer/candidateCreatorCascade.cxx index e8a8613aacf..2d3132c1a43 100644 --- a/PWGHF/TableProducer/candidateCreatorCascade.cxx +++ b/PWGHF/TableProducer/candidateCreatorCascade.cxx @@ -18,7 +18,7 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/TableProducer/candidateCreatorDstar.cxx b/PWGHF/TableProducer/candidateCreatorDstar.cxx index dd36c4122af..d426776a293 100644 --- a/PWGHF/TableProducer/candidateCreatorDstar.cxx +++ b/PWGHF/TableProducer/candidateCreatorDstar.cxx @@ -20,7 +20,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGHF/Utils/utilsPid.h" #include "PWGHF/Utils/utilsTrkCandHf.h" diff --git a/PWGHF/TableProducer/candidateCreatorLb.cxx b/PWGHF/TableProducer/candidateCreatorLb.cxx index 5157be71213..997e969d7b5 100644 --- a/PWGHF/TableProducer/candidateCreatorLb.cxx +++ b/PWGHF/TableProducer/candidateCreatorLb.cxx @@ -20,7 +20,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsTrkCandHf.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx index 27fbf053b3a..300d4c6e348 100644 --- a/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx +++ b/PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx @@ -23,7 +23,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" // for dca recalculation #include "PWGHF/Utils/utilsEvSelHf.h" diff --git a/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx b/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx index 3671030694a..25cbd949fe9 100644 --- a/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx +++ b/PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx @@ -25,7 +25,7 @@ #include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx b/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx index 167a8cff0fe..5984add510e 100644 --- a/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx +++ b/PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx @@ -25,7 +25,7 @@ #include "PWGHF/Core/DecayChannelsLegacy.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/PWGHF/TableProducer/candidateCreatorXicc.cxx b/PWGHF/TableProducer/candidateCreatorXicc.cxx index e055e956a59..8879dcb3d55 100644 --- a/PWGHF/TableProducer/candidateCreatorXicc.cxx +++ b/PWGHF/TableProducer/candidateCreatorXicc.cxx @@ -22,7 +22,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/trackUtilities.h" diff --git a/PWGHF/TableProducer/candidateSelectorCd.cxx b/PWGHF/TableProducer/candidateSelectorCd.cxx index 2fa2f49a140..ebf76c0a2af 100644 --- a/PWGHF/TableProducer/candidateSelectorCd.cxx +++ b/PWGHF/TableProducer/candidateSelectorCd.cxx @@ -19,7 +19,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorD0.cxx b/PWGHF/TableProducer/candidateSelectorD0.cxx index bd439da2f41..ac5d54399ab 100644 --- a/PWGHF/TableProducer/candidateSelectorD0.cxx +++ b/PWGHF/TableProducer/candidateSelectorD0.cxx @@ -21,7 +21,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx b/PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx index 42803cc5aa5..902e4ccf707 100644 --- a/PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx @@ -21,7 +21,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx b/PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx index 3826643b598..b11b4d02db4 100644 --- a/PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx @@ -21,7 +21,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx b/PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx index c61788f99d4..264f98ec911 100644 --- a/PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx +++ b/PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx @@ -21,7 +21,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorLc.cxx b/PWGHF/TableProducer/candidateSelectorLc.cxx index 8c009cefb84..566b38c62ca 100644 --- a/PWGHF/TableProducer/candidateSelectorLc.cxx +++ b/PWGHF/TableProducer/candidateSelectorLc.cxx @@ -23,7 +23,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/TrackSelectorPID.h" #include "Common/DataModel/PIDResponseCombined.h" diff --git a/PWGHF/TableProducer/candidateSelectorLcPidMl.cxx b/PWGHF/TableProducer/candidateSelectorLcPidMl.cxx index 2d2abe0bf06..f27e5edc3cd 100644 --- a/PWGHF/TableProducer/candidateSelectorLcPidMl.cxx +++ b/PWGHF/TableProducer/candidateSelectorLcPidMl.cxx @@ -21,7 +21,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx b/PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx index e755ef656b5..aff5a163b21 100644 --- a/PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx +++ b/PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx @@ -23,7 +23,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/TrackSelectorPID.h" diff --git a/PWGHF/TableProducer/converterDstarIndices.cxx b/PWGHF/TableProducer/converterDstarIndices.cxx index a449f6542a6..18d7fffe6c1 100644 --- a/PWGHF/TableProducer/converterDstarIndices.cxx +++ b/PWGHF/TableProducer/converterDstarIndices.cxx @@ -14,7 +14,7 @@ /// /// \author Fabrizio Grosa , CERN -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include #include diff --git a/PWGHF/TableProducer/refitPvDummy.cxx b/PWGHF/TableProducer/refitPvDummy.cxx index 783747b8b72..b8a90739438 100644 --- a/PWGHF/TableProducer/refitPvDummy.cxx +++ b/PWGHF/TableProducer/refitPvDummy.cxx @@ -14,7 +14,7 @@ /// /// \author Mattia Faggin , University and INFN Padova, Italy -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/trackUtilities.h" diff --git a/PWGHF/TableProducer/trackIndexSkimCreator.cxx b/PWGHF/TableProducer/trackIndexSkimCreator.cxx index 4330d371444..effb32b8e2a 100644 --- a/PWGHF/TableProducer/trackIndexSkimCreator.cxx +++ b/PWGHF/TableProducer/trackIndexSkimCreator.cxx @@ -24,7 +24,7 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/AliasTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsAnalysis.h" #include "PWGHF/Utils/utilsBfieldCCDB.h" #include "PWGHF/Utils/utilsEvSelHf.h" diff --git a/PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx b/PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx index e6f7a69c08c..78dc3546e8b 100644 --- a/PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx +++ b/PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx @@ -21,7 +21,7 @@ #include "PWGHF/Core/CentralityEstimation.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGLF/DataModel/mcCentrality.h" #include "Common/Core/RecoDecay.h" diff --git a/PWGHF/TableProducer/treeCreatorOmegacSt.cxx b/PWGHF/TableProducer/treeCreatorOmegacSt.cxx index 31ee87f772b..4095eef7dba 100644 --- a/PWGHF/TableProducer/treeCreatorOmegacSt.cxx +++ b/PWGHF/TableProducer/treeCreatorOmegacSt.cxx @@ -15,7 +15,7 @@ /// \author Jochen Klein /// \author Tiantian Cheng -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsTrkCandHf.h" #include "PWGLF/DataModel/LFStrangenessTables.h" diff --git a/PWGHF/Tasks/taskLcCentrality.cxx b/PWGHF/Tasks/taskLcCentrality.cxx index 4401b58e44c..9baf9bd3bcf 100644 --- a/PWGHF/Tasks/taskLcCentrality.cxx +++ b/PWGHF/Tasks/taskLcCentrality.cxx @@ -22,7 +22,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/DataModel/Centrality.h" diff --git a/PWGHF/Tasks/taskMcEfficiency.cxx b/PWGHF/Tasks/taskMcEfficiency.cxx index 3afee0779d0..7f1c09eef47 100644 --- a/PWGHF/Tasks/taskMcEfficiency.cxx +++ b/PWGHF/Tasks/taskMcEfficiency.cxx @@ -17,7 +17,7 @@ #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/RecoDecay.h" #include "Common/DataModel/TrackSelectionTables.h" diff --git a/PWGHF/Tasks/taskMcValidation.cxx b/PWGHF/Tasks/taskMcValidation.cxx index c2bd1f0a12b..928dba464ba 100644 --- a/PWGHF/Tasks/taskMcValidation.cxx +++ b/PWGHF/Tasks/taskMcValidation.cxx @@ -22,7 +22,7 @@ #include "PWGHF/Core/DecayChannels.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "PWGHF/Utils/utilsEvSelHf.h" #include "PWGLF/DataModel/mcCentrality.h" diff --git a/PWGHF/Tasks/taskSelOptimisation.cxx b/PWGHF/Tasks/taskSelOptimisation.cxx index 15787a42a6e..cd4425ff6b9 100644 --- a/PWGHF/Tasks/taskSelOptimisation.cxx +++ b/PWGHF/Tasks/taskSelOptimisation.cxx @@ -16,7 +16,7 @@ #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" -#include "PWGHF/DataModel/CandidateSkimmingTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" #include "Common/Core/RecoDecay.h"