diff --git a/PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h b/PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h new file mode 100644 index 00000000000..ddf7bacc33d --- /dev/null +++ b/PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h @@ -0,0 +1,208 @@ +// 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_ALICE3_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ +#define PWGHF_ALICE3_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ + +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/DataModel/TrackIndexSkimmingTables.h" + +#include +#include +#include + +namespace o2::aod +{ +// specific chic candidate properties +namespace hf_cand_chic +{ +DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfCand2Prong, "_0"); // Jpsi index +// DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, ECALs, "_1"); +DECLARE_SOA_COLUMN(JpsiToMuMuMass, jpsiToMuMuMass, float); // Jpsi mass +} // namespace hf_cand_chic + +// declare dedicated chi_c candidate table +DECLARE_SOA_TABLE(HfCandChicBase, "AOD", "HFCANDCHICBASE", + // general columns + HFCAND_COLUMNS, + // 2-prong specific columns + hf_cand::PxProng0, hf_cand::PyProng0, hf_cand::PzProng0, + hf_cand::PxProng1, hf_cand::PyProng1, hf_cand::PzProng1, + hf_cand::ImpactParameter0, hf_cand::ImpactParameter1, + hf_cand::ErrorImpactParameter0, hf_cand::ErrorImpactParameter1, + hf_cand_chic::Prong0Id, /*hf_cand_chic::Prong1Id,*/ + hf_track_index::HFflag, hf_cand_chic::JpsiToMuMuMass, + /* dynamic columns */ + hf_cand_2prong::M, + hf_cand_2prong::M2, + /* prong 2 */ + // hf_cand::PtProng1, + // hf_cand::Pt2Prong1, + // hf_cand::PVectorProng1, + /* dynamic columns that use candidate momentum components */ + hf_cand::Pt, + hf_cand::Pt2, + hf_cand::P, + hf_cand::P2, + hf_cand::PVector, + hf_cand::Cpa, + hf_cand::CpaXY, + hf_cand::Ct, + hf_cand::ImpactParameterXY, + hf_cand_2prong::MaxNormalisedDeltaIP, + hf_cand::Eta, + hf_cand::Phi, + hf_cand::Y, + hf_cand::E, + hf_cand::E2); + +// extended table with expression columns that can be used as arguments of dynamic columns +DECLARE_SOA_EXTENDED_TABLE_USER(HfCandChicExt, HfCandChicBase, "HFCANDCHICEXT", + hf_cand_2prong::Px, hf_cand_2prong::Py, hf_cand_2prong::Pz); + +using HfCandChic = HfCandChicExt; + +// table with results of reconstruction level MC matching +DECLARE_SOA_TABLE(HfCandChicMcRec, "AOD", "HFCANDCHICMCREC", //! + hf_cand_mc_flag::FlagMcMatchRec, + hf_cand_mc_flag::OriginMcRec, + hf_cand_mc_flag::FlagMcDecayChanRec); + +// table with results of generator level MC matching +DECLARE_SOA_TABLE(HfCandChicMcGen, "AOD", "HFCANDCHICMCGEN", //! + hf_cand_mc_flag::FlagMcMatchGen, + hf_cand_mc_flag::OriginMcGen, + hf_cand_mc_flag::FlagMcDecayChanGen); + +namespace hf_cand_x +{ +DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfCand2Prong, "_0"); // Jpsi index +} // namespace hf_cand_x + +// declare dedicated X candidate table +DECLARE_SOA_TABLE(HfCandXBase, "AOD", "HFCANDXBASE", + // general columns + HFCAND_COLUMNS, + // 3-prong specific columns + hf_cand::PxProng0, hf_cand::PyProng0, hf_cand::PzProng0, + hf_cand::PxProng1, hf_cand::PyProng1, hf_cand::PzProng1, + hf_cand::PxProng2, hf_cand::PyProng2, hf_cand::PzProng2, + hf_cand::ImpactParameter0, hf_cand::ImpactParameter1, hf_cand::ImpactParameter2, + hf_cand::ErrorImpactParameter0, hf_cand::ErrorImpactParameter1, hf_cand::ErrorImpactParameter2, + hf_cand_x::Prong0Id, hf_track_index::Prong1Id, hf_track_index::Prong2Id, // note the difference between Jpsi and pion indices + hf_track_index::HFflag, + /* dynamic columns */ + hf_cand_3prong::M, + hf_cand_3prong::M2, + /* prong 2 */ + hf_cand::PtProng2, + hf_cand::Pt2Prong2, + hf_cand::PVectorProng2, + /* dynamic columns that use candidate momentum components */ + hf_cand::Pt, + hf_cand::Pt2, + hf_cand::P, + hf_cand::P2, + hf_cand::PVector, + hf_cand::Cpa, + hf_cand::CpaXY, + hf_cand::Ct, + hf_cand::ImpactParameterXY, + hf_cand_3prong::MaxNormalisedDeltaIP, + hf_cand::Eta, + hf_cand::Phi, + hf_cand::Y, + hf_cand::E, + hf_cand::E2); + +// extended table with expression columns that can be used as arguments of dynamic columns +DECLARE_SOA_EXTENDED_TABLE_USER(HfCandXExt, HfCandXBase, "HFCANDXEXT", + hf_cand_3prong::Px, hf_cand_3prong::Py, hf_cand_3prong::Pz); + +using HfCandX = HfCandXExt; + +// table with results of reconstruction level MC matching +DECLARE_SOA_TABLE(HfCandXMcRec, "AOD", "HFCANDXMCREC", //! + hf_cand_mc_flag::FlagMcMatchRec, + hf_cand_mc_flag::OriginMcRec, + hf_cand_mc_flag::FlagMcDecayChanRec); + +// table with results of generator level MC matching +DECLARE_SOA_TABLE(HfCandXMcGen, "AOD", "HFCANDXMCGEN", //! + hf_cand_mc_flag::FlagMcMatchGen, + hf_cand_mc_flag::OriginMcGen, + hf_cand_mc_flag::FlagMcDecayChanGen); + +// specific Xicc candidate properties +namespace hf_cand_xicc +{ +DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfCand3Prong, "_0"); // Xic index +} // namespace hf_cand_xicc + +// declare dedicated Xicc candidate table +DECLARE_SOA_TABLE(HfCandXiccBase, "AOD", "HFCANDXICCBASE", + // general columns + HFCAND_COLUMNS, + // 2-prong specific columns + hf_cand::PxProng0, hf_cand::PyProng0, hf_cand::PzProng0, + hf_cand::PxProng1, hf_cand::PyProng1, hf_cand::PzProng1, + hf_cand::ImpactParameter0, hf_cand::ImpactParameter1, + hf_cand::ErrorImpactParameter0, hf_cand::ErrorImpactParameter1, + hf_cand_xicc::Prong0Id, hf_track_index::Prong1Id, + hf_track_index::HFflag, + /* dynamic columns */ + hf_cand_2prong::M, + hf_cand_2prong::M2, + hf_cand_2prong::ImpactParameterProduct, + /* dynamic columns that use candidate momentum components */ + hf_cand::Pt, + hf_cand::Pt2, + hf_cand::P, + hf_cand::P2, + hf_cand::PVector, + hf_cand::Cpa, + hf_cand::CpaXY, + hf_cand::Ct, + hf_cand::ImpactParameterXY, + hf_cand_2prong::MaxNormalisedDeltaIP, + hf_cand::Eta, + hf_cand::Phi, + hf_cand::Y, + hf_cand::E, + hf_cand::E2); + +// extended table with expression columns that can be used as arguments of dynamic columns +DECLARE_SOA_EXTENDED_TABLE_USER(HfCandXiccExt, HfCandXiccBase, "HFCANDXICCEXT", + hf_cand_2prong::Px, hf_cand_2prong::Py, hf_cand_2prong::Pz); + +using HfCandXicc = HfCandXiccExt; + +// table with results of reconstruction level MC matching +DECLARE_SOA_TABLE(HfCandXiccMcRec, "AOD", "HFCANDXICCMCREC", //! + hf_cand_mc_flag::FlagMcMatchRec, + hf_cand_mc_flag::OriginMcRec, + hf_cand_mc_flag::DebugMcRec); + +// table with results of generator level MC matching +DECLARE_SOA_TABLE(HfCandXiccMcGen, "AOD", "HFCANDXICCMCGEN", //! + hf_cand_mc_flag::FlagMcMatchGen, + hf_cand_mc_flag::OriginMcGen); + +} // namespace o2::aod + +#endif // PWGHF_ALICE3_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_ diff --git a/PWGHF/ALICE3/DataModel/CandidateSelectionTables.h b/PWGHF/ALICE3/DataModel/CandidateSelectionTables.h new file mode 100644 index 00000000000..f2d45eb55ad --- /dev/null +++ b/PWGHF/ALICE3/DataModel/CandidateSelectionTables.h @@ -0,0 +1,166 @@ +// 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 CandidateSelectionTables.h +/// \brief Definitions of tables produced by candidate selectors +/// +/// \author Nima Zardoshti , CERN + +#ifndef PWGHF_ALICE3_DATAMODEL_CANDIDATESELECTIONTABLES_H_ +#define PWGHF_ALICE3_DATAMODEL_CANDIDATESELECTIONTABLES_H_ + +#include + +namespace o2::aod +{ +namespace hf_sel_candidate_d0_parametrized_pid +{ +DECLARE_SOA_COLUMN(IsSelD0NoPid, isSelD0NoPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0PerfectPid, isSelD0PerfectPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0, isSelD0, int); //! +DECLARE_SOA_COLUMN(IsSelD0barNoPid, isSelD0barNoPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0barPerfectPid, isSelD0barPerfectPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0bar, isSelD0bar, int); //! +} // namespace hf_sel_candidate_d0_parametrized_pid + +DECLARE_SOA_TABLE(HfSelD0ParametrizedPid, "AOD", "HFSELD0P", //! + hf_sel_candidate_d0_parametrized_pid::IsSelD0NoPid, + hf_sel_candidate_d0_parametrized_pid::IsSelD0PerfectPid, + hf_sel_candidate_d0_parametrized_pid::IsSelD0, + hf_sel_candidate_d0_parametrized_pid::IsSelD0barNoPid, + hf_sel_candidate_d0_parametrized_pid::IsSelD0barPerfectPid, + hf_sel_candidate_d0_parametrized_pid::IsSelD0bar); + +namespace hf_sel_candidate_d0_alice3_barrel +{ +DECLARE_SOA_COLUMN(IsSelHfFlag, isSelHfFlag, int); //! +DECLARE_SOA_COLUMN(IsSelD0NoPid, isSelD0NoPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0PerfectPid, isSelD0PerfectPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0TofPid, isSelD0TofPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0RichPid, isSelD0RichPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0TofPlusRichPid, isSelD0TofPlusRichPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0barTofPlusRichPid, isSelD0barTofPlusRichPid, int); //! +} // namespace hf_sel_candidate_d0_alice3_barrel + +DECLARE_SOA_TABLE(HfSelD0Alice3Barrel, "AOD", "HFSELD0A3B", //! + hf_sel_candidate_d0_alice3_barrel::IsSelHfFlag, + hf_sel_candidate_d0_alice3_barrel::IsSelD0NoPid, + hf_sel_candidate_d0_alice3_barrel::IsSelD0PerfectPid, + hf_sel_candidate_d0_alice3_barrel::IsSelD0TofPid, + hf_sel_candidate_d0_alice3_barrel::IsSelD0RichPid, + hf_sel_candidate_d0_alice3_barrel::IsSelD0TofPlusRichPid, + hf_sel_candidate_d0_alice3_barrel::IsSelD0barTofPlusRichPid); + +namespace hf_sel_candidate_d0_alice3_forward +{ +DECLARE_SOA_COLUMN(IsSelHfFlag, isSelHfFlag, int); //! +DECLARE_SOA_COLUMN(IsSelD0FNoPid, isSelD0FNoPid, int); //! +DECLARE_SOA_COLUMN(IsSelD0FRichPid, isSelD0FRichPid, int); //! +} // namespace hf_sel_candidate_d0_alice3_forward + +DECLARE_SOA_TABLE(HfSelD0Alice3Forward, "AOD", "HFSELD0A3F", //! + hf_sel_candidate_d0_alice3_forward::IsSelHfFlag, + hf_sel_candidate_d0_alice3_forward::IsSelD0FNoPid, + hf_sel_candidate_d0_alice3_forward::IsSelD0FRichPid); + +namespace hf_sel_candidate_lc_alice3 +{ +DECLARE_SOA_COLUMN(IsSelLcToPKPiNoPid, isSelLcToPKPiNoPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPKPiPerfectPid, isSelLcToPKPiPerfectPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPKPiTofPid, isSelLcToPKPiTofPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPKPiTofPlusRichPid, isSelLcToPKPiTofPlusRichPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPiKPNoPid, isSelLcToPiKPNoPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPiKPPerfectPid, isSelLcToPiKPPerfectPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPiKPTofPid, isSelLcToPiKPTofPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPiKPTofPlusRichPid, isSelLcToPiKPTofPlusRichPid, int); //! +} // namespace hf_sel_candidate_lc_alice3 + +DECLARE_SOA_TABLE(HfSelLcAlice3, "AOD", "HFSELLCA3B", //! + hf_sel_candidate_lc_alice3::IsSelLcToPKPiNoPid, + hf_sel_candidate_lc_alice3::IsSelLcToPKPiPerfectPid, + hf_sel_candidate_lc_alice3::IsSelLcToPKPiTofPid, + hf_sel_candidate_lc_alice3::IsSelLcToPKPiTofPlusRichPid, + hf_sel_candidate_lc_alice3::IsSelLcToPiKPNoPid, + hf_sel_candidate_lc_alice3::IsSelLcToPiKPPerfectPid, + hf_sel_candidate_lc_alice3::IsSelLcToPiKPTofPid, + hf_sel_candidate_lc_alice3::IsSelLcToPiKPTofPlusRichPid); + +namespace hf_sel_candidate_lc_parametrized_pid +{ +DECLARE_SOA_COLUMN(IsSelLcToPKPiNoPid, isSelLcToPKPiNoPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPKPiPerfectPid, isSelLcToPKPiPerfectPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPKPi, isSelLcToPKPi, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPiKPNoPid, isSelLcToPiKPNoPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPiKPPerfectPid, isSelLcToPiKPPerfectPid, int); //! +DECLARE_SOA_COLUMN(IsSelLcToPiKP, isSelLcToPiKP, int); //! +} // namespace hf_sel_candidate_lc_parametrized_pid + +DECLARE_SOA_TABLE(HfSelLcParametrizedPid, "AOD", "HFSELLCP", //! + hf_sel_candidate_lc_parametrized_pid::IsSelLcToPKPiNoPid, + hf_sel_candidate_lc_parametrized_pid::IsSelLcToPKPiPerfectPid, + hf_sel_candidate_lc_parametrized_pid::IsSelLcToPKPi, + hf_sel_candidate_lc_parametrized_pid::IsSelLcToPiKPNoPid, + hf_sel_candidate_lc_parametrized_pid::IsSelLcToPiKPPerfectPid, + hf_sel_candidate_lc_parametrized_pid::IsSelLcToPiKP); + +namespace hf_sel_candidate_jpsi +{ +DECLARE_SOA_COLUMN(IsSelJpsiToEE, isSelJpsiToEE, int); //! +DECLARE_SOA_COLUMN(IsSelJpsiToMuMu, isSelJpsiToMuMu, int); //! +DECLARE_SOA_COLUMN(IsSelJpsiToEETopol, isSelJpsiToEETopol, int); //! +DECLARE_SOA_COLUMN(IsSelJpsiToEETpc, isSelJpsiToEETpc, int); //! +DECLARE_SOA_COLUMN(IsSelJpsiToEETof, isSelJpsiToEETof, int); //! +DECLARE_SOA_COLUMN(IsSelJpsiToEERich, isSelJpsiToEERich, int); //! +DECLARE_SOA_COLUMN(IsSelJpsiToEETofRich, isSelJpsiToEETofRich, int); //! +DECLARE_SOA_COLUMN(IsSelJpsiToMuMuTopol, isSelJpsiToMuMuTopol, int); //! +DECLARE_SOA_COLUMN(IsSelJpsiToMuMuMid, isSelJpsiToMuMuMid, int); //! +} // namespace hf_sel_candidate_jpsi + +DECLARE_SOA_TABLE(HfSelJpsi, "AOD", "HFSELJPSI", //! + hf_sel_candidate_jpsi::IsSelJpsiToEE, + hf_sel_candidate_jpsi::IsSelJpsiToMuMu, + hf_sel_candidate_jpsi::IsSelJpsiToEETopol, + hf_sel_candidate_jpsi::IsSelJpsiToEETpc, + hf_sel_candidate_jpsi::IsSelJpsiToEETof, + hf_sel_candidate_jpsi::IsSelJpsiToEERich, + hf_sel_candidate_jpsi::IsSelJpsiToEETofRich, + hf_sel_candidate_jpsi::IsSelJpsiToMuMuTopol, + hf_sel_candidate_jpsi::IsSelJpsiToMuMuMid); + +namespace hf_sel_candidate_x +{ +DECLARE_SOA_COLUMN(IsSelXToJpsiToEEPiPi, isSelXToJpsiToEEPiPi, int); //! +DECLARE_SOA_COLUMN(IsSelXToJpsiToMuMuPiPi, isSelXToJpsiToMuMuPiPi, int); //! +} // namespace hf_sel_candidate_x + +DECLARE_SOA_TABLE(HfSelXToJpsiPiPi, "AOD", "HFSELX", //! + hf_sel_candidate_x::IsSelXToJpsiToEEPiPi, hf_sel_candidate_x::IsSelXToJpsiToMuMuPiPi); + +namespace hf_sel_candidate_chic +{ +DECLARE_SOA_COLUMN(IsSelChicToJpsiToEEGamma, isSelChicToJpsiToEEGamma, int); //! +DECLARE_SOA_COLUMN(IsSelChicToJpsiToMuMuGamma, isSelChicToJpsiToMuMuGamma, int); //! +} // namespace hf_sel_candidate_chic + +DECLARE_SOA_TABLE(HfSelChicToJpsiGamma, "AOD", "HFSELCHIC", //! + hf_sel_candidate_chic::IsSelChicToJpsiToEEGamma, hf_sel_candidate_chic::IsSelChicToJpsiToMuMuGamma); + +namespace hf_sel_candidate_xicc +{ +DECLARE_SOA_COLUMN(IsSelXiccToPKPiPi, isSelXiccToPKPiPi, int); //! +} // namespace hf_sel_candidate_xicc + +DECLARE_SOA_TABLE(HfSelXiccToPKPiPi, "AOD", "HFSELXICC", //! + hf_sel_candidate_xicc::IsSelXiccToPKPiPi); + +} // namespace o2::aod + +#endif // PWGHF_ALICE3_DATAMODEL_CANDIDATESELECTIONTABLES_H_ diff --git a/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx b/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx index b03c9bf6952..ee9d90c178f 100644 --- a/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx @@ -15,11 +15,13 @@ /// /// \author Alessandro De Falco , Cagliari University +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" +#include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "ALICE3/DataModel/ECAL.h" #include "Common/Core/trackUtilities.h" #include diff --git a/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx b/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx index f0dfb8d761c..daf0e2fe7b2 100644 --- a/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx @@ -16,6 +16,8 @@ /// \author Rik Spijkers , Utrecht University /// \author Luca Micheletti , INFN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateCreatorXicc.cxx b/PWGHF/ALICE3/TableProducer/candidateCreatorXicc.cxx index a605acdc7fc..2d30f704d67 100644 --- a/PWGHF/ALICE3/TableProducer/candidateCreatorXicc.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateCreatorXicc.cxx @@ -18,6 +18,8 @@ /// \author Mattia Faggin , University and INFN PADOVA #include "PWGHF/ALICE3/Core/DecayChannelsLegacy.h" +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/AliasTables.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx index 0c4b37e21c4..2096b646f17 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx @@ -15,6 +15,8 @@ /// /// \author Alessandro De Falco , Università/INFN Cagliari +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx index 5fb93e341f5..6a49ab90852 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx @@ -15,6 +15,8 @@ /// \author Nima Zardoshti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx index ab2e05c16e8..e9f2645ce0d 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx @@ -15,6 +15,8 @@ /// \author Nima Zardoshti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx index 474d0eda059..31216646ba3 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx @@ -15,6 +15,8 @@ /// \author Nima Zardoshti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx index 40f8aee3e01..9b2db0530af 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx @@ -16,6 +16,8 @@ /// \author Nima Zardoshti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx index 1844f315f28..904daf44b45 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx @@ -16,6 +16,8 @@ /// \author Nima Zardoshti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx index 5fbde221894..c494536e169 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorLcParametrizedPid.cxx @@ -16,6 +16,8 @@ /// \author Nima Zardoshti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx index 69ef001ab57..d24b5d80bde 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorXToJpsiPiPi.cxx @@ -16,6 +16,8 @@ /// \author Rik Spijkers , Utrecht University /// \author Luca Micheletti , INFN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/candidateSelectorXiccToPKPiPi.cxx b/PWGHF/ALICE3/TableProducer/candidateSelectorXiccToPKPiPi.cxx index 12a5bc3477f..0754aa27539 100644 --- a/PWGHF/ALICE3/TableProducer/candidateSelectorXiccToPKPiPi.cxx +++ b/PWGHF/ALICE3/TableProducer/candidateSelectorXiccToPKPiPi.cxx @@ -15,6 +15,8 @@ /// \author Gian Michele Innocenti , CERN #include "PWGHF/ALICE3/Core/DecayChannelsLegacy.h" +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/AliasTables.h" diff --git a/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx b/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx index 589d889fdcb..a7d6dca0f42 100644 --- a/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx +++ b/PWGHF/ALICE3/TableProducer/treeCreatorChicToJpsiGamma.cxx @@ -18,6 +18,8 @@ /// \author Alessandro De Falco , Università/INFN Cagliari /// \author Luca Micheletti , INFN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx b/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx index 2a9c9c49faf..a92171bb28c 100644 --- a/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx +++ b/PWGHF/ALICE3/TableProducer/treeCreatorXToJpsiPiPi.cxx @@ -17,6 +17,8 @@ /// /// \author Luca Micheletti , INFN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/TableProducer/treeCreatorXiccToPKPiPi.cxx b/PWGHF/ALICE3/TableProducer/treeCreatorXiccToPKPiPi.cxx index 305ec024513..582967fffe4 100644 --- a/PWGHF/ALICE3/TableProducer/treeCreatorXiccToPKPiPi.cxx +++ b/PWGHF/ALICE3/TableProducer/treeCreatorXiccToPKPiPi.cxx @@ -18,6 +18,8 @@ /// \author Jinjoo Seo , Inha University #include "PWGHF/ALICE3/Core/DecayChannelsLegacy.h" +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskChic.cxx b/PWGHF/ALICE3/Tasks/taskChic.cxx index f6ed3fbabe0..84e749c0dc8 100644 --- a/PWGHF/ALICE3/Tasks/taskChic.cxx +++ b/PWGHF/ALICE3/Tasks/taskChic.cxx @@ -15,6 +15,8 @@ /// \author Gian Michele Innocenti , CERN /// \author Alessandro De Falco , Cagliari University +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx b/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx index a6a79fa2e23..1aa6989dec6 100644 --- a/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx +++ b/PWGHF/ALICE3/Tasks/taskD0Alice3Barrel.cxx @@ -15,6 +15,8 @@ /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx b/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx index ac528208830..8064b70756f 100644 --- a/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx +++ b/PWGHF/ALICE3/Tasks/taskD0Alice3Forward.cxx @@ -15,6 +15,8 @@ /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx b/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx index 23d160348d8..5132bfc55e2 100644 --- a/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx +++ b/PWGHF/ALICE3/Tasks/taskD0ParametrizedPid.cxx @@ -15,6 +15,8 @@ /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskJpsi.cxx b/PWGHF/ALICE3/Tasks/taskJpsi.cxx index 9390751b7ee..ea5c2abf616 100644 --- a/PWGHF/ALICE3/Tasks/taskJpsi.cxx +++ b/PWGHF/ALICE3/Tasks/taskJpsi.cxx @@ -16,6 +16,8 @@ /// \author Vít Kučera , CERN /// \author Biao Zhang , CCNU +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx b/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx index 703ba304092..c39455ca5d8 100644 --- a/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx +++ b/PWGHF/ALICE3/Tasks/taskLcAlice3.cxx @@ -15,6 +15,8 @@ /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx b/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx index ff8e2aad4a4..21e97ad4355 100644 --- a/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx +++ b/PWGHF/ALICE3/Tasks/taskLcParametrizedPid.cxx @@ -15,6 +15,8 @@ /// \author Gian Michele Innocenti , CERN /// \author Vít Kučera , CERN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskX.cxx b/PWGHF/ALICE3/Tasks/taskX.cxx index 2391634f8ce..3cde2020102 100644 --- a/PWGHF/ALICE3/Tasks/taskX.cxx +++ b/PWGHF/ALICE3/Tasks/taskX.cxx @@ -16,6 +16,8 @@ /// \author Rik Spijkers , Utrecht University /// \author Luca Micheletti , INFN +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" diff --git a/PWGHF/ALICE3/Tasks/taskXicc.cxx b/PWGHF/ALICE3/Tasks/taskXicc.cxx index f75ca850c81..3a00bc928bd 100644 --- a/PWGHF/ALICE3/Tasks/taskXicc.cxx +++ b/PWGHF/ALICE3/Tasks/taskXicc.cxx @@ -17,6 +17,8 @@ /// \author Jinjoo Seo , Inha University #include "PWGHF/ALICE3/Core/DecayChannelsLegacy.h" +#include "PWGHF/ALICE3/DataModel/CandidateReconstructionTables.h" +#include "PWGHF/ALICE3/DataModel/CandidateSelectionTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/Core/SelectorCuts.h" #include "PWGHF/DataModel/AliasTables.h" diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h index 67060a4219e..b4d60f34123 100644 --- a/PWGHF/DataModel/CandidateReconstructionTables.h +++ b/PWGHF/DataModel/CandidateReconstructionTables.h @@ -23,7 +23,6 @@ // #include "PWGLF/DataModel/LFStrangenessTables.h" -// #include "ALICE3/DataModel/ECAL.h" #include "Common/Core/RecoDecay.h" #include @@ -927,120 +926,6 @@ enum ConstructMethod { DcaFitter = 0, KfParticle }; } // namespace hf_cand_casc_lf -namespace hf_cand_x -{ -DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfCand2Prong, "_0"); // Jpsi index -} // namespace hf_cand_x - -// declare dedicated X candidate table -DECLARE_SOA_TABLE(HfCandXBase, "AOD", "HFCANDXBASE", - // general columns - HFCAND_COLUMNS, - // 3-prong specific columns - hf_cand::PxProng0, hf_cand::PyProng0, hf_cand::PzProng0, - hf_cand::PxProng1, hf_cand::PyProng1, hf_cand::PzProng1, - hf_cand::PxProng2, hf_cand::PyProng2, hf_cand::PzProng2, - hf_cand::ImpactParameter0, hf_cand::ImpactParameter1, hf_cand::ImpactParameter2, - hf_cand::ErrorImpactParameter0, hf_cand::ErrorImpactParameter1, hf_cand::ErrorImpactParameter2, - hf_cand_x::Prong0Id, hf_track_index::Prong1Id, hf_track_index::Prong2Id, // note the difference between Jpsi and pion indices - hf_track_index::HFflag, - /* dynamic columns */ - hf_cand_3prong::M, - hf_cand_3prong::M2, - /* prong 2 */ - hf_cand::PtProng2, - hf_cand::Pt2Prong2, - hf_cand::PVectorProng2, - /* dynamic columns that use candidate momentum components */ - hf_cand::Pt, - hf_cand::Pt2, - hf_cand::P, - hf_cand::P2, - hf_cand::PVector, - hf_cand::Cpa, - hf_cand::CpaXY, - hf_cand::Ct, - hf_cand::ImpactParameterXY, - hf_cand_3prong::MaxNormalisedDeltaIP, - hf_cand::Eta, - hf_cand::Phi, - hf_cand::Y, - hf_cand::E, - hf_cand::E2); - -// extended table with expression columns that can be used as arguments of dynamic columns -DECLARE_SOA_EXTENDED_TABLE_USER(HfCandXExt, HfCandXBase, "HFCANDXEXT", - hf_cand_3prong::Px, hf_cand_3prong::Py, hf_cand_3prong::Pz); - -using HfCandX = HfCandXExt; - -// table with results of reconstruction level MC matching -DECLARE_SOA_TABLE(HfCandXMcRec, "AOD", "HFCANDXMCREC", //! - hf_cand_mc_flag::FlagMcMatchRec, - hf_cand_mc_flag::OriginMcRec, - hf_cand_mc_flag::FlagMcDecayChanRec); - -// table with results of generator level MC matching -DECLARE_SOA_TABLE(HfCandXMcGen, "AOD", "HFCANDXMCGEN", //! - hf_cand_mc_flag::FlagMcMatchGen, - hf_cand_mc_flag::OriginMcGen, - hf_cand_mc_flag::FlagMcDecayChanGen); - -// specific Xicc candidate properties -namespace hf_cand_xicc -{ -DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfCand3Prong, "_0"); // Xic index -} // namespace hf_cand_xicc - -// declare dedicated Xicc candidate table -DECLARE_SOA_TABLE(HfCandXiccBase, "AOD", "HFCANDXICCBASE", - // general columns - HFCAND_COLUMNS, - // 2-prong specific columns - hf_cand::PxProng0, hf_cand::PyProng0, hf_cand::PzProng0, - hf_cand::PxProng1, hf_cand::PyProng1, hf_cand::PzProng1, - hf_cand::ImpactParameter0, hf_cand::ImpactParameter1, - hf_cand::ErrorImpactParameter0, hf_cand::ErrorImpactParameter1, - hf_cand_xicc::Prong0Id, hf_track_index::Prong1Id, - hf_track_index::HFflag, - /* dynamic columns */ - hf_cand_2prong::M, - hf_cand_2prong::M2, - hf_cand_2prong::ImpactParameterProduct, - /* dynamic columns that use candidate momentum components */ - hf_cand::Pt, - hf_cand::Pt2, - hf_cand::P, - hf_cand::P2, - hf_cand::PVector, - hf_cand::Cpa, - hf_cand::CpaXY, - hf_cand::Ct, - hf_cand::ImpactParameterXY, - hf_cand_2prong::MaxNormalisedDeltaIP, - hf_cand::Eta, - hf_cand::Phi, - hf_cand::Y, - hf_cand::E, - hf_cand::E2); - -// extended table with expression columns that can be used as arguments of dynamic columns -DECLARE_SOA_EXTENDED_TABLE_USER(HfCandXiccExt, HfCandXiccBase, "HFCANDXICCEXT", - hf_cand_2prong::Px, hf_cand_2prong::Py, hf_cand_2prong::Pz); - -using HfCandXicc = HfCandXiccExt; - -// table with results of reconstruction level MC matching -DECLARE_SOA_TABLE(HfCandXiccMcRec, "AOD", "HFCANDXICCMCREC", //! - hf_cand_mc_flag::FlagMcMatchRec, - hf_cand_mc_flag::OriginMcRec, - hf_cand_mc_flag::DebugMcRec); - -// table with results of generator level MC matching -DECLARE_SOA_TABLE(HfCandXiccMcGen, "AOD", "HFCANDXICCMCGEN", //! - hf_cand_mc_flag::FlagMcMatchGen, - hf_cand_mc_flag::OriginMcGen); - // specific Omegac and Xic to Xi Pi candidate properties namespace hf_cand_xic0_omegac0 { @@ -1731,67 +1616,6 @@ DECLARE_SOA_TABLE(HfCandXicResid, "AOD", "HFCANDXICRESID", hf_cand_xic_to_xi_pi_pi::YSvPull, hf_cand_xic_to_xi_pi_pi::ZSvPull); -// specific chic candidate properties -// namespace hf_cand_chic -// { -// DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfCand2Prong, "_0"); // Jpsi index -// DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, ECALs, "_1"); -// DECLARE_SOA_COLUMN(JpsiToMuMuMass, jpsiToMuMuMass, float); // Jpsi mass -// } // namespace hf_cand_chic - -// // declare dedicated chi_c candidate table -// DECLARE_SOA_TABLE(HfCandChicBase, "AOD", "HFCANDCHICBASE", -// // general columns -// HFCAND_COLUMNS, -// // 2-prong specific columns -// hf_cand::PxProng0, hf_cand::PyProng0, hf_cand::PzProng0, -// hf_cand::PxProng1, hf_cand::PyProng1, hf_cand::PzProng1, -// hf_cand::ImpactParameter0, hf_cand::ImpactParameter1, -// hf_cand::ErrorImpactParameter0, hf_cand::ErrorImpactParameter1, -// hf_cand_chic::Prong0Id, hf_cand_chic::Prong1Id, -// hf_track_index::HFflag, hf_cand_chic::JpsiToMuMuMass, -// /* dynamic columns */ -// hf_cand_2prong::M, -// hf_cand_2prong::M2, -// /* prong 2 */ -// // hf_cand::PtProng1, -// // hf_cand::Pt2Prong1, -// // hf_cand::PVectorProng1, -// /* dynamic columns that use candidate momentum components */ -// hf_cand::Pt, -// hf_cand::Pt2, -// hf_cand::P, -// hf_cand::P2, -// hf_cand::PVector, -// hf_cand::Cpa, -// hf_cand::CpaXY, -// hf_cand::Ct, -// hf_cand::ImpactParameterXY, -// hf_cand_2prong::MaxNormalisedDeltaIP, -// hf_cand::Eta, -// hf_cand::Phi, -// hf_cand::Y, -// hf_cand::E, -// hf_cand::E2); - -// // extended table with expression columns that can be used as arguments of dynamic columns -// DECLARE_SOA_EXTENDED_TABLE_USER(HfCandChicExt, HfCandChicBase, "HFCANDCHICEXT", -// hf_cand_2prong::Px, hf_cand_2prong::Py, hf_cand_2prong::Pz); - -// using HfCandChic = HfCandChicExt; - -// // table with results of reconstruction level MC matching -// DECLARE_SOA_TABLE(HfCandChicMcRec, "AOD", "HFCANDCHICMCREC", //! -// hf_cand_mc_flag::FlagMcMatchRec, -// hf_cand_mc_flag::OriginMcRec, -// hf_cand_mc_flag::FlagMcDecayChanRec); - -// // table with results of generator level MC matching -// DECLARE_SOA_TABLE(HfCandChicMcGen, "AOD", "HFCANDCHICMCGEN", //! -// hf_cand_mc_flag::FlagMcMatchGen, -// hf_cand_mc_flag::OriginMcGen, -// hf_cand_mc_flag::FlagMcDecayChanGen); - // specific Lb candidate properties namespace hf_cand_lb { diff --git a/PWGHF/DataModel/CandidateSelectionTables.h b/PWGHF/DataModel/CandidateSelectionTables.h index a359794da92..0e06ab6797c 100644 --- a/PWGHF/DataModel/CandidateSelectionTables.h +++ b/PWGHF/DataModel/CandidateSelectionTables.h @@ -56,56 +56,6 @@ DECLARE_SOA_TABLE(HfMlD0, "AOD", "HFMLD0", //! hf_sel_candidate_d0::MlProbD0, hf_sel_candidate_d0::MlProbD0bar); -namespace hf_sel_candidate_d0_parametrized_pid -{ -DECLARE_SOA_COLUMN(IsSelD0NoPid, isSelD0NoPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0PerfectPid, isSelD0PerfectPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0, isSelD0, int); //! -DECLARE_SOA_COLUMN(IsSelD0barNoPid, isSelD0barNoPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0barPerfectPid, isSelD0barPerfectPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0bar, isSelD0bar, int); //! -} // namespace hf_sel_candidate_d0_parametrized_pid - -DECLARE_SOA_TABLE(HfSelD0ParametrizedPid, "AOD", "HFSELD0P", //! - hf_sel_candidate_d0_parametrized_pid::IsSelD0NoPid, - hf_sel_candidate_d0_parametrized_pid::IsSelD0PerfectPid, - hf_sel_candidate_d0_parametrized_pid::IsSelD0, - hf_sel_candidate_d0_parametrized_pid::IsSelD0barNoPid, - hf_sel_candidate_d0_parametrized_pid::IsSelD0barPerfectPid, - hf_sel_candidate_d0_parametrized_pid::IsSelD0bar); - -namespace hf_sel_candidate_d0_alice3_barrel -{ -DECLARE_SOA_COLUMN(IsSelHfFlag, isSelHfFlag, int); //! -DECLARE_SOA_COLUMN(IsSelD0NoPid, isSelD0NoPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0PerfectPid, isSelD0PerfectPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0TofPid, isSelD0TofPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0RichPid, isSelD0RichPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0TofPlusRichPid, isSelD0TofPlusRichPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0barTofPlusRichPid, isSelD0barTofPlusRichPid, int); //! -} // namespace hf_sel_candidate_d0_alice3_barrel - -DECLARE_SOA_TABLE(HfSelD0Alice3Barrel, "AOD", "HFSELD0A3B", //! - hf_sel_candidate_d0_alice3_barrel::IsSelHfFlag, - hf_sel_candidate_d0_alice3_barrel::IsSelD0NoPid, - hf_sel_candidate_d0_alice3_barrel::IsSelD0PerfectPid, - hf_sel_candidate_d0_alice3_barrel::IsSelD0TofPid, - hf_sel_candidate_d0_alice3_barrel::IsSelD0RichPid, - hf_sel_candidate_d0_alice3_barrel::IsSelD0TofPlusRichPid, - hf_sel_candidate_d0_alice3_barrel::IsSelD0barTofPlusRichPid); - -namespace hf_sel_candidate_d0_alice3_forward -{ -DECLARE_SOA_COLUMN(IsSelHfFlag, isSelHfFlag, int); //! -DECLARE_SOA_COLUMN(IsSelD0FNoPid, isSelD0FNoPid, int); //! -DECLARE_SOA_COLUMN(IsSelD0FRichPid, isSelD0FRichPid, int); //! -} // namespace hf_sel_candidate_d0_alice3_forward - -DECLARE_SOA_TABLE(HfSelD0Alice3Forward, "AOD", "HFSELD0A3F", //! - hf_sel_candidate_d0_alice3_forward::IsSelHfFlag, - hf_sel_candidate_d0_alice3_forward::IsSelD0FNoPid, - hf_sel_candidate_d0_alice3_forward::IsSelD0FRichPid); - namespace hf_sel_candidate_dplus { DECLARE_SOA_COLUMN(IsSelDplusToPiKPi, isSelDplusToPiKPi, int); //! @@ -188,70 +138,6 @@ DECLARE_SOA_COLUMN(IsSelChToPiKHe, isSelChToPiKHe, int); //! DECLARE_SOA_TABLE(HfSelCh, "AOD", "HFSELCH", //! hf_sel_candidate_ch::IsSelChToHeKPi, hf_sel_candidate_ch::IsSelChToPiKHe); -namespace hf_sel_candidate_lc_alice3 -{ -DECLARE_SOA_COLUMN(IsSelLcToPKPiNoPid, isSelLcToPKPiNoPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPKPiPerfectPid, isSelLcToPKPiPerfectPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPKPiTofPid, isSelLcToPKPiTofPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPKPiTofPlusRichPid, isSelLcToPKPiTofPlusRichPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPiKPNoPid, isSelLcToPiKPNoPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPiKPPerfectPid, isSelLcToPiKPPerfectPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPiKPTofPid, isSelLcToPiKPTofPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPiKPTofPlusRichPid, isSelLcToPiKPTofPlusRichPid, int); //! -} // namespace hf_sel_candidate_lc_alice3 - -DECLARE_SOA_TABLE(HfSelLcAlice3, "AOD", "HFSELLCA3B", //! - hf_sel_candidate_lc_alice3::IsSelLcToPKPiNoPid, - hf_sel_candidate_lc_alice3::IsSelLcToPKPiPerfectPid, - hf_sel_candidate_lc_alice3::IsSelLcToPKPiTofPid, - hf_sel_candidate_lc_alice3::IsSelLcToPKPiTofPlusRichPid, - hf_sel_candidate_lc_alice3::IsSelLcToPiKPNoPid, - hf_sel_candidate_lc_alice3::IsSelLcToPiKPPerfectPid, - hf_sel_candidate_lc_alice3::IsSelLcToPiKPTofPid, - hf_sel_candidate_lc_alice3::IsSelLcToPiKPTofPlusRichPid); - -namespace hf_sel_candidate_lc_parametrized_pid -{ -DECLARE_SOA_COLUMN(IsSelLcToPKPiNoPid, isSelLcToPKPiNoPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPKPiPerfectPid, isSelLcToPKPiPerfectPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPKPi, isSelLcToPKPi, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPiKPNoPid, isSelLcToPiKPNoPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPiKPPerfectPid, isSelLcToPiKPPerfectPid, int); //! -DECLARE_SOA_COLUMN(IsSelLcToPiKP, isSelLcToPiKP, int); //! -} // namespace hf_sel_candidate_lc_parametrized_pid - -DECLARE_SOA_TABLE(HfSelLcParametrizedPid, "AOD", "HFSELLCP", //! - hf_sel_candidate_lc_parametrized_pid::IsSelLcToPKPiNoPid, - hf_sel_candidate_lc_parametrized_pid::IsSelLcToPKPiPerfectPid, - hf_sel_candidate_lc_parametrized_pid::IsSelLcToPKPi, - hf_sel_candidate_lc_parametrized_pid::IsSelLcToPiKPNoPid, - hf_sel_candidate_lc_parametrized_pid::IsSelLcToPiKPPerfectPid, - hf_sel_candidate_lc_parametrized_pid::IsSelLcToPiKP); - -namespace hf_sel_candidate_jpsi -{ -DECLARE_SOA_COLUMN(IsSelJpsiToEE, isSelJpsiToEE, int); //! -DECLARE_SOA_COLUMN(IsSelJpsiToMuMu, isSelJpsiToMuMu, int); //! -DECLARE_SOA_COLUMN(IsSelJpsiToEETopol, isSelJpsiToEETopol, int); //! -DECLARE_SOA_COLUMN(IsSelJpsiToEETpc, isSelJpsiToEETpc, int); //! -DECLARE_SOA_COLUMN(IsSelJpsiToEETof, isSelJpsiToEETof, int); //! -DECLARE_SOA_COLUMN(IsSelJpsiToEERich, isSelJpsiToEERich, int); //! -DECLARE_SOA_COLUMN(IsSelJpsiToEETofRich, isSelJpsiToEETofRich, int); //! -DECLARE_SOA_COLUMN(IsSelJpsiToMuMuTopol, isSelJpsiToMuMuTopol, int); //! -DECLARE_SOA_COLUMN(IsSelJpsiToMuMuMid, isSelJpsiToMuMuMid, int); //! -} // namespace hf_sel_candidate_jpsi - -DECLARE_SOA_TABLE(HfSelJpsi, "AOD", "HFSELJPSI", //! - hf_sel_candidate_jpsi::IsSelJpsiToEE, - hf_sel_candidate_jpsi::IsSelJpsiToMuMu, - hf_sel_candidate_jpsi::IsSelJpsiToEETopol, - hf_sel_candidate_jpsi::IsSelJpsiToEETpc, - hf_sel_candidate_jpsi::IsSelJpsiToEETof, - hf_sel_candidate_jpsi::IsSelJpsiToEERich, - hf_sel_candidate_jpsi::IsSelJpsiToEETofRich, - hf_sel_candidate_jpsi::IsSelJpsiToMuMuTopol, - hf_sel_candidate_jpsi::IsSelJpsiToMuMuMid); - namespace hf_sel_candidate_lc_to_k0s_p { DECLARE_SOA_COLUMN(IsSelLcToK0sP, isSelLcToK0sP, int); @@ -315,24 +201,6 @@ DECLARE_SOA_TABLE(HfSelLbToLcPi, "AOD", "HFSELLB", //! DECLARE_SOA_TABLE(HfMlLbToLcPi, "AOD", "HFMLLB", //! hf_sel_candidate_lb::MlProbLbToLcPi); -namespace hf_sel_candidate_x -{ -DECLARE_SOA_COLUMN(IsSelXToJpsiToEEPiPi, isSelXToJpsiToEEPiPi, int); //! -DECLARE_SOA_COLUMN(IsSelXToJpsiToMuMuPiPi, isSelXToJpsiToMuMuPiPi, int); //! -} // namespace hf_sel_candidate_x - -DECLARE_SOA_TABLE(HfSelXToJpsiPiPi, "AOD", "HFSELX", //! - hf_sel_candidate_x::IsSelXToJpsiToEEPiPi, hf_sel_candidate_x::IsSelXToJpsiToMuMuPiPi); - -namespace hf_sel_candidate_chic -{ -DECLARE_SOA_COLUMN(IsSelChicToJpsiToEEGamma, isSelChicToJpsiToEEGamma, int); //! -DECLARE_SOA_COLUMN(IsSelChicToJpsiToMuMuGamma, isSelChicToJpsiToMuMuGamma, int); //! -} // namespace hf_sel_candidate_chic - -DECLARE_SOA_TABLE(HfSelChicToJpsiGamma, "AOD", "HFSELCHIC", //! - hf_sel_candidate_chic::IsSelChicToJpsiToEEGamma, hf_sel_candidate_chic::IsSelChicToJpsiToMuMuGamma); - namespace hf_sel_candidate_xic { // XicPlus to P K Pi @@ -363,14 +231,6 @@ DECLARE_SOA_TABLE(HfSelXicToXiPiPi, "AOD", "HFSELXICTOXI2PI", //! DECLARE_SOA_TABLE(HfMlXicToXiPiPi, "AOD", "HFMLXICTOXI2PI", //! hf_sel_candidate_xic::MlProbXicToXiPiPi); -namespace hf_sel_candidate_xicc -{ -DECLARE_SOA_COLUMN(IsSelXiccToPKPiPi, isSelXiccToPKPiPi, int); //! -} // namespace hf_sel_candidate_xicc - -DECLARE_SOA_TABLE(HfSelXiccToPKPiPi, "AOD", "HFSELXICC", //! - hf_sel_candidate_xicc::IsSelXiccToPKPiPi); - namespace hf_sel_toxipi { DECLARE_SOA_COLUMN(StatusPidLambda, statusPidLambda, bool);