Skip to content

Commit c1591db

Browse files
ZFedericaZFederica
committed
Implement suggestions
1 parent 3ee7d0c commit c1591db

File tree

2 files changed

+89
-108
lines changed

2 files changed

+89
-108
lines changed

‎PWGHF/DataModel/CandidateReconstructionTables.h‎

Lines changed: 9 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ DECLARE_SOA_INDEX_COLUMN_FULL(Prong2, prong2, int, Tracks, "_2"); //! Index to t
195195
DECLARE_SOA_INDEX_COLUMN(V0, v0); //! Index to V0 prong
196196
DECLARE_SOA_INDEX_COLUMN(Cascade, cascade); //! Index to cascade prong
197197
DECLARE_SOA_COLUMN(HFflag, hfflag, uint8_t); //!
198-
DECLARE_SOA_COLUMN(CascadePIDHyp, cascadePIDHyp, int);
199198

200199
DECLARE_SOA_COLUMN(FlagD0ToKPi, flagD0ToKPi, uint8_t); //!
201200
DECLARE_SOA_COLUMN(FlagJpsiToEE, flagJpsiToEE, uint8_t); //!
@@ -262,7 +261,7 @@ DECLARE_SOA_TABLE(HfCascLf2Prongs, "AOD", "HFCASCLF2PRONG", //! Table for HF 2 p
262261
hf_track_index::CollisionId,
263262
hf_track_index::CascadeId,
264263
hf_track_index::Prong0Id,
265-
hf_track_index::CascadePIDHyp);
264+
hf_track_index::HFflag);
266265
using HfCascLf2Prong = HfCascLf2Prongs::iterator;
267266

268267
DECLARE_SOA_TABLE(HfCascLf3Prongs, "AOD", "HFCASCLF3PRONG", //! Table for HF 3 prong candidates with a Cascade
@@ -271,7 +270,7 @@ DECLARE_SOA_TABLE(HfCascLf3Prongs, "AOD", "HFCASCLF3PRONG", //! Table for HF 3 p
271270
hf_track_index::CascadeId,
272271
hf_track_index::Prong0Id,
273272
hf_track_index::Prong1Id,
274-
hf_track_index::CascadePIDHyp);
273+
hf_track_index::HFflag);
275274
using HfCascLf3Prong = HfCascLf3Prongs::iterator;
276275

277276
namespace hf_track_index
@@ -829,70 +828,17 @@ DECLARE_SOA_TABLE(HfCand3ProngMcGen, "AOD", "HFCAND3PMCGEN", //!
829828
hf_cand_3prong::OriginMcGen,
830829
hf_cand_3prong::FlagMcDecayChanGen);
831830

832-
namespace hf_cand_casc_lf_2prong
831+
namespace hf_cand_casc_lf
833832
{
834-
DECLARE_SOA_EXPRESSION_COLUMN(Px, px, //!
835-
float, 1.f * aod::hf_cand::pxProng0 + 1.f * aod::hf_cand::pxProng1);
836-
DECLARE_SOA_EXPRESSION_COLUMN(Py, py, //!
837-
float, 1.f * aod::hf_cand::pyProng0 + 1.f * aod::hf_cand::pyProng1);
838-
DECLARE_SOA_EXPRESSION_COLUMN(Pz, pz, //!
839-
float, 1.f * aod::hf_cand::pzProng0 + 1.f * aod::hf_cand::pzProng1);
840-
DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterProduct, impactParameterProduct, //!
841-
[](float dca1, float dca2) -> float { return dca1 * dca2; });
842-
DECLARE_SOA_DYNAMIC_COLUMN(M, m, //!
843-
[](float px0, float py0, float pz0, float px1, float py1, float pz1, const std::array<double, 2>& m) -> float { return RecoDecay::m(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m); });
844-
DECLARE_SOA_DYNAMIC_COLUMN(M2, m2, //!
845-
[](float px0, float py0, float pz0, float px1, float py1, float pz1, const std::array<double, 2>& m) -> float { return RecoDecay::m2(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m); });
846-
DECLARE_SOA_DYNAMIC_COLUMN(CosThetaStar, cosThetaStar, //!
847-
[](float px0, float py0, float pz0, float px1, float py1, float pz1, const std::array<double, 2>& m, double mTot, int iProng) -> float { return RecoDecay::cosThetaStar(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m, mTot, iProng); });
848-
DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterProngSqSum, impactParameterProngSqSum, //!
849-
[](float impParProng0, float impParProng1) -> float { return RecoDecay::sumOfSquares(impParProng0, impParProng1); });
850-
DECLARE_SOA_DYNAMIC_COLUMN(MaxNormalisedDeltaIP, maxNormalisedDeltaIP, //!
851-
[](float xVtxP, float yVtxP, float xVtxS, float yVtxS, float errDlxy, float pxM, float pyM, float ip0, float errIp0, float ip1, float errIp1, float px0, float py0, float px1, float py1) -> float { return RecoDecay::maxNormalisedDeltaIP(std::array{xVtxP, yVtxP}, std::array{xVtxS, yVtxS}, errDlxy, std::array{pxM, pyM}, std::array{ip0, ip1}, std::array{errIp0, errIp1}, std::array{std::array{px0, py0}, std::array{px1, py1}}); });
852-
// MC matching result:
853-
DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t); //! reconstruction level
854-
DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t); //! generator level
855-
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); //! particle origin, reconstruction level
856-
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); //! particle origin, generator level
857-
858833
// mapping of decay types
859-
enum DecayType { XiczeroOmegaczeroToXiPi = 0,
860-
OmegaczeroToOmegaPi,
861-
N2ProngDecays }; // always keep N2ProngDecays at the end
862-
863-
} // namespace hf_cand_casc_lf_2prong
864-
865-
namespace hf_cand_casc_lf_3prong
866-
{
867-
DECLARE_SOA_EXPRESSION_COLUMN(Px, px, //!
868-
float, 1.f * aod::hf_cand::pxProng0 + 1.f * aod::hf_cand::pxProng1);
869-
DECLARE_SOA_EXPRESSION_COLUMN(Py, py, //!
870-
float, 1.f * aod::hf_cand::pyProng0 + 1.f * aod::hf_cand::pyProng1);
871-
DECLARE_SOA_EXPRESSION_COLUMN(Pz, pz, //!
872-
float, 1.f * aod::hf_cand::pzProng0 + 1.f * aod::hf_cand::pzProng1);
873-
DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterProduct, impactParameterProduct, //!
874-
[](float dca1, float dca2) -> float { return dca1 * dca2; });
875-
DECLARE_SOA_DYNAMIC_COLUMN(M, m, //!
876-
[](float px0, float py0, float pz0, float px1, float py1, float pz1, const std::array<double, 2>& m) -> float { return RecoDecay::m(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m); });
877-
DECLARE_SOA_DYNAMIC_COLUMN(M2, m2, //!
878-
[](float px0, float py0, float pz0, float px1, float py1, float pz1, const std::array<double, 2>& m) -> float { return RecoDecay::m2(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m); });
879-
DECLARE_SOA_DYNAMIC_COLUMN(CosThetaStar, cosThetaStar, //!
880-
[](float px0, float py0, float pz0, float px1, float py1, float pz1, const std::array<double, 2>& m, double mTot, int iProng) -> float { return RecoDecay::cosThetaStar(std::array{std::array{px0, py0, pz0}, std::array{px1, py1, pz1}}, m, mTot, iProng); });
881-
DECLARE_SOA_DYNAMIC_COLUMN(ImpactParameterProngSqSum, impactParameterProngSqSum, //!
882-
[](float impParProng0, float impParProng1) -> float { return RecoDecay::sumOfSquares(impParProng0, impParProng1); });
883-
DECLARE_SOA_DYNAMIC_COLUMN(MaxNormalisedDeltaIP, maxNormalisedDeltaIP, //!
884-
[](float xVtxP, float yVtxP, float xVtxS, float yVtxS, float errDlxy, float pxM, float pyM, float ip0, float errIp0, float ip1, float errIp1, float px0, float py0, float px1, float py1) -> float { return RecoDecay::maxNormalisedDeltaIP(std::array{xVtxP, yVtxP}, std::array{xVtxS, yVtxS}, errDlxy, std::array{pxM, pyM}, std::array{ip0, ip1}, std::array{errIp0, errIp1}, std::array{std::array{px0, py0}, std::array{px1, py1}}); });
885-
// MC matching result:
886-
DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t); //! reconstruction level
887-
DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t); //! generator level
888-
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t); //! particle origin, reconstruction level
889-
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); //! particle origin, generator level
834+
enum DecayType2Prong { XiczeroOmegaczeroToXiPi = 0,
835+
OmegaczeroToOmegaPi,
836+
N2ProngDecays }; // always keep N2ProngDecays at the end
890837

891838
// mapping of decay types
892-
enum DecayType { XicplusToXiPiPi = 0,
893-
N3ProngDecays }; // always keep N3ProngDecays at the end
894-
895-
} // namespace hf_cand_casc_lf_3prong
839+
enum DecayType3Prong { XicplusToXiPiPi = 0,
840+
N3ProngDecays }; // always keep N3ProngDecays at the end
841+
} // namespace hf_cand_casc_lf
896842

897843
namespace hf_cand_x
898844
{

0 commit comments

Comments
 (0)