Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PWGHF/D2H/Tasks/taskOmegac0ToOmegapi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,10 @@ struct HfTaskOmegac0ToOmegapi {
auto numPvContributors = candidate.template collision_as<CollType>().numContrib();

if constexpr (applyMl) {
registry.fill(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.mlProbOmegac()[0], candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), candidate.kfRapOmegac(), candidate.ptBhadMotherPart(), candidate.originRec(), candidate.flagMcMatchRec(), numPvContributors);
registry.fill(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.mlProbOmegac()[0], candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), candidate.kfRapOmegac(), candidate.ptBhadMotherPart(), candidate.originMcRec(), candidate.flagMcMatchRec(), numPvContributors);

} else {
registry.fill(HIST("hMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), candidate.kfRapOmegac(), candidate.ptBhadMotherPart(), candidate.originRec(), candidate.flagMcMatchRec(), numPvContributors);
registry.fill(HIST("hMassVsPtVsPtBVsYVsOriginVsOmegac0Type"), candidate.invMassCharmBaryon(), candidate.ptCharmBaryon(), candidate.kfRapOmegac(), candidate.ptBhadMotherPart(), candidate.originMcRec(), candidate.flagMcMatchRec(), numPvContributors);
}
}

Expand All @@ -298,7 +298,7 @@ struct HfTaskOmegac0ToOmegapi {
maxNumContrib = recCol.numContrib() > maxNumContrib ? recCol.numContrib() : maxNumContrib;
}

if (particle.originGen() == RecoDecay::OriginType::Prompt) {
if (particle.originMcGen() == RecoDecay::OriginType::Prompt) {
registry.fill(HIST("hSparseAcc"), ptGen, -1., yGen, RecoDecay::OriginType::Prompt, maxNumContrib);
} else {
float ptGenB = mcParticles.rawIteratorAt(particle.idxBhadMotherPart()).pt();
Expand Down
6 changes: 3 additions & 3 deletions PWGHF/D2H/Tasks/taskXic0ToXiPi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ struct HfTaskXic0ToXiPi {
kfptXic,
candidate.kfRapXic(),
candidate.ptBhadMotherPart(),
candidate.originRec(),
candidate.originMcRec(),
candidate.flagMcMatchRec(),
numPvContributors);
} else {
Expand All @@ -252,7 +252,7 @@ struct HfTaskXic0ToXiPi {
kfptXic,
candidate.kfRapXic(),
candidate.ptBhadMotherPart(),
candidate.originRec(),
candidate.originMcRec(),
candidate.flagMcMatchRec(),
numPvContributors);
}
Expand All @@ -273,7 +273,7 @@ struct HfTaskXic0ToXiPi {
maxNumContrib = recCol.numContrib() > maxNumContrib ? recCol.numContrib() : maxNumContrib;
}

if (particle.originGen() == RecoDecay::OriginType::Prompt) {
if (particle.originMcGen() == RecoDecay::OriginType::Prompt) {
registry.fill(HIST("hSparseAcc"),
ptGen,
-1.,
Expand Down
31 changes: 16 additions & 15 deletions PWGHF/DataModel/CandidateReconstructionTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, Tracks, "_0"); //! Index to f
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)
Expand Down Expand Up @@ -1566,8 +1567,8 @@ DECLARE_SOA_COLUMN(CollisionMatched, collisionMatched, bool);
DECLARE_SOA_COLUMN(DebugGenCharmBar, debugGenCharmBar, int8_t);
DECLARE_SOA_COLUMN(DebugGenCasc, debugGenCasc, int8_t);
DECLARE_SOA_COLUMN(DebugGenLambda, debugGenLambda, int8_t);
DECLARE_SOA_COLUMN(OriginRec, originRec, int8_t);
DECLARE_SOA_COLUMN(OriginGen, originGen, int8_t);
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t);
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t);
DECLARE_SOA_COLUMN(PtCharmBaryonGen, ptCharmBaryonGen, float);
DECLARE_SOA_COLUMN(RapidityCharmBaryonGen, rapidityCharmBaryonGen, float);

Expand Down Expand Up @@ -1790,31 +1791,31 @@ DECLARE_SOA_TABLE(HfCandToXiPiKfQa, "AOD", "HFCANDTOXIPIKFQA",
DECLARE_SOA_TABLE(HfXicToXiPiMCRec, "AOD", "HFXICXIPIMCREC", //!
hf_cand_xic0_omegac0::FlagMcMatchRec,
hf_cand_xic0_omegac0::DebugMcRec,
hf_cand_xic0_omegac0::OriginRec,
hf_cand_xic0_omegac0::OriginMcRec,
hf_cand_xic0_omegac0::CollisionMatched,
hf_cand::PtBhadMotherPart,
hf_cand::PdgBhadMotherPart,
o2::soa::Marker<1>);
DECLARE_SOA_TABLE(HfOmegacToXiPiMCRec, "AOD", "HFOMCXIPIMCREC", //!
hf_cand_xic0_omegac0::FlagMcMatchRec,
hf_cand_xic0_omegac0::DebugMcRec,
hf_cand_xic0_omegac0::OriginRec,
hf_cand_xic0_omegac0::OriginMcRec,
hf_cand_xic0_omegac0::CollisionMatched,
hf_cand::PtBhadMotherPart,
hf_cand::PdgBhadMotherPart,
o2::soa::Marker<2>);
DECLARE_SOA_TABLE(HfToOmegaPiMCRec, "AOD", "HFTOOMEPIMCREC", //!
hf_cand_xic0_omegac0::FlagMcMatchRec,
hf_cand_xic0_omegac0::DebugMcRec,
hf_cand_xic0_omegac0::OriginRec,
hf_cand_xic0_omegac0::OriginMcRec,
hf_cand_xic0_omegac0::CollisionMatched,
hf_cand::PtBhadMotherPart,
hf_cand::PdgBhadMotherPart,
o2::soa::Marker<3>);
DECLARE_SOA_TABLE(HfToOmegaKMCRec, "AOD", "HFTOOMEKMCREC", //!
hf_cand_xic0_omegac0::FlagMcMatchRec,
hf_cand_xic0_omegac0::DebugMcRec,
hf_cand_xic0_omegac0::OriginRec,
hf_cand_xic0_omegac0::OriginMcRec,
hf_cand_xic0_omegac0::CollisionMatched,
hf_cand::PtBhadMotherPart,
hf_cand::PdgBhadMotherPart,
Expand All @@ -1823,16 +1824,16 @@ DECLARE_SOA_TABLE(HfToOmegaKMCRec, "AOD", "HFTOOMEKMCREC", //!
// table with results of generator level MC matching
DECLARE_SOA_TABLE(HfXicToXiPiMCGen, "AOD", "HFXICXIPIMCGEN", //!
hf_cand_xic0_omegac0::FlagMcMatchGen, hf_cand_xic0_omegac0::DebugGenCharmBar, hf_cand_xic0_omegac0::DebugGenCasc, hf_cand_xic0_omegac0::DebugGenLambda,
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<1>);
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginMcGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<1>);
DECLARE_SOA_TABLE(HfOmegacToXiPiMCGen, "AOD", "HFOMECXIPIMCGEN", //!
hf_cand_xic0_omegac0::FlagMcMatchGen, hf_cand_xic0_omegac0::DebugGenCharmBar, hf_cand_xic0_omegac0::DebugGenCasc, hf_cand_xic0_omegac0::DebugGenLambda,
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<2>);
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginMcGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<2>);
DECLARE_SOA_TABLE(HfToOmegaPiMCGen, "AOD", "HFTOOMEPIMCGEN", //!
hf_cand_xic0_omegac0::FlagMcMatchGen, hf_cand_xic0_omegac0::DebugGenCharmBar, hf_cand_xic0_omegac0::DebugGenCasc, hf_cand_xic0_omegac0::DebugGenLambda,
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<3>);
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginMcGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<3>);
DECLARE_SOA_TABLE(HfToOmegaKMCGen, "AOD", "HFTOOMEKMCGEN", //!
hf_cand_xic0_omegac0::FlagMcMatchGen, hf_cand_xic0_omegac0::DebugGenCharmBar, hf_cand_xic0_omegac0::DebugGenCasc, hf_cand_xic0_omegac0::DebugGenLambda,
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<4>);
hf_cand_xic0_omegac0::PtCharmBaryonGen, hf_cand_xic0_omegac0::RapidityCharmBaryonGen, hf_cand_xic0_omegac0::OriginMcGen, hf_cand::IdxBhadMotherPart, o2::soa::Marker<4>);

// specific Xic to Xi Pi Pi candidate properties
namespace hf_cand_xic_to_xi_pi_pi
Expand Down Expand Up @@ -1900,8 +1901,8 @@ DECLARE_SOA_COLUMN(NSigTofPrFromLambda, nSigTofPrFromLambda, float);
// MC matching result:
DECLARE_SOA_COLUMN(FlagMcMatchRec, flagMcMatchRec, int8_t); // reconstruction level
DECLARE_SOA_COLUMN(FlagMcMatchGen, flagMcMatchGen, int8_t); // generator level
DECLARE_SOA_COLUMN(OriginRec, originRec, int8_t);
DECLARE_SOA_COLUMN(OriginGen, originGen, int8_t);
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int8_t);
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t);
// Residuals and pulls
DECLARE_SOA_COLUMN(PtResidual, ptResidual, float);
DECLARE_SOA_COLUMN(PResidual, pResidual, float);
Expand Down Expand Up @@ -2003,17 +2004,17 @@ DECLARE_SOA_TABLE(HfCandXicKF, "AOD", "HFCANDXICKF",
// table with results of reconstruction level MC matching
DECLARE_SOA_TABLE(HfCandXicMcRec, "AOD", "HFCANDXICMCREC",
hf_cand_xic_to_xi_pi_pi::FlagMcMatchRec,
hf_cand_xic_to_xi_pi_pi::OriginRec);
hf_cand_xic_to_xi_pi_pi::OriginMcRec);

// table with results of generator level MC matching
DECLARE_SOA_TABLE(HfCandXicMcGen, "AOD", "HFCANDXICMCGEN",
hf_cand_xic_to_xi_pi_pi::FlagMcMatchGen,
hf_cand_xic_to_xi_pi_pi::OriginGen,
hf_cand_xic_to_xi_pi_pi::OriginMcGen,
hf_cand::PdgBhadMotherPart);

// table with residuals and pulls of PV
DECLARE_SOA_TABLE(HfCandXicResid, "AOD", "HFCANDXICRESID",
hf_cand_xic_to_xi_pi_pi::OriginGen,
hf_cand_xic_to_xi_pi_pi::OriginMcGen,
hf_cand_xic_to_xi_pi_pi::PResidual,
hf_cand_xic_to_xi_pi_pi::PtResidual,
hf_cand_xic_to_xi_pi_pi::XPvResidual,
Expand Down
Loading
Loading