Skip to content
3 changes: 1 addition & 2 deletions PWGHF/DataModel/CandidateSelectionTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -393,13 +393,12 @@ DECLARE_SOA_COLUMN(PidTpcInfoStored, pidTpcInfoStored, int);
DECLARE_SOA_COLUMN(PidTofInfoStored, pidTofInfoStored, int);
// Machine learning column for omegac0 to omega pi
DECLARE_SOA_COLUMN(MlProbOmegac, mlProbOmegac, std::vector<float>);
DECLARE_SOA_COLUMN(MlValueOmegac, mlValueOmegac, float);
} // namespace hf_sel_toomegapi

DECLARE_SOA_TABLE(HfSelToOmegaPi, "AOD", "HFSELTOOMEPI",
hf_sel_toomegapi::StatusPidLambda, hf_sel_toomegapi::StatusPidCascade, hf_sel_toomegapi::StatusPidCharmBaryon,
hf_sel_toomegapi::StatusInvMassLambda, hf_sel_toomegapi::StatusInvMassCascade, hf_sel_toomegapi::StatusInvMassCharmBaryon,
hf_sel_toomegapi::ResultSelections, hf_sel_toomegapi::PidTpcInfoStored, hf_sel_toomegapi::PidTofInfoStored, hf_sel_toomegapi::MlValueOmegac,
hf_sel_toomegapi::ResultSelections, hf_sel_toomegapi::PidTpcInfoStored, hf_sel_toomegapi::PidTofInfoStored,
hf_sel_toomegapi::TpcNSigmaPiFromCharmBaryon, hf_sel_toomegapi::TpcNSigmaKaFromCasc, hf_sel_toomegapi::TpcNSigmaPiFromLambda, hf_sel_toomegapi::TpcNSigmaPrFromLambda,
hf_sel_toomegapi::TofNSigmaPiFromCharmBaryon, hf_sel_toomegapi::TofNSigmaKaFromCasc, hf_sel_toomegapi::TofNSigmaPiFromLambda, hf_sel_toomegapi::TofNSigmaPrFromLambda);

Expand Down
6 changes: 2 additions & 4 deletions PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPi.cxx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPi.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file]

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -354,7 +354,7 @@
// pt-dependent selection
if (!selectionTopol(candidate)) {
resultSelections = false;
hfSelToOmegaPi(statusPidLambda, statusPidCascade, statusPidCharmBaryon, statusInvMassLambda, statusInvMassCascade, statusInvMassCharmBaryon, resultSelections, infoTpcStored, infoTofStored, outputMlOmegac[0],
hfSelToOmegaPi(statusPidLambda, statusPidCascade, statusPidCharmBaryon, statusInvMassLambda, statusInvMassCascade, statusInvMassCharmBaryon, resultSelections, infoTpcStored, infoTofStored,
trackPiFromCharm.tpcNSigmaPi(), trackKaFromCasc.tpcNSigmaKa(), trackPiFromLam.tpcNSigmaPi(), trackPrFromLam.tpcNSigmaPr(),
trackPiFromCharm.tofNSigmaPi(), trackKaFromCasc.tofNSigmaKa(), trackPiFromLam.tofNSigmaPi(), trackPrFromLam.tofNSigmaPr());
if constexpr (ConstructMethod == hf_cand_casc_lf::ConstructMethod::KfParticle) {
Expand Down Expand Up @@ -746,14 +746,12 @@
isSelectedMlOmegac = hfMlResponse.isSelectedMl(inputFeaturesOmegaC, ptCand, outputMlOmegac);
if (isSelectedMlOmegac) {
registry.fill(HIST("hBDTScoreTest1"), outputMlOmegac[0]);
} else {
resultSelections = false;
}
hfMlSelToOmegaPi(outputMlOmegac);
}
}

hfSelToOmegaPi(statusPidLambda, statusPidCascade, statusPidCharmBaryon, statusInvMassLambda, statusInvMassCascade, statusInvMassCharmBaryon, resultSelections, infoTpcStored, infoTofStored, outputMlOmegac[0],
hfSelToOmegaPi(statusPidLambda, statusPidCascade, statusPidCharmBaryon, statusInvMassLambda, statusInvMassCascade, statusInvMassCharmBaryon, resultSelections, infoTpcStored, infoTofStored,
trackPiFromCharm.tpcNSigmaPi(), trackKaFromCasc.tpcNSigmaKa(), trackPiFromLam.tpcNSigmaPi(), trackPrFromLam.tpcNSigmaPr(),
trackPiFromCharm.tofNSigmaPi(), trackKaFromCasc.tofNSigmaKa(), trackPiFromLam.tofNSigmaPi(), trackPrFromLam.tofNSigmaPr());

Expand Down
41 changes: 1 addition & 40 deletions PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ DECLARE_SOA_COLUMN(OmegacChi2OverNdf, omegacChi2OverNdf, float);
DECLARE_SOA_COLUMN(MassV0Chi2OverNdf, massV0Chi2OverNdf, float);
DECLARE_SOA_COLUMN(MassCascChi2OverNdf, massCascChi2OverNdf, float);
DECLARE_SOA_COLUMN(CascRejectInvmass, cascRejectInvmass, float);
DECLARE_SOA_COLUMN(OutputMlOmegac, outputMlOmegac, float);
} // namespace full

DECLARE_SOA_TABLE(HfToOmegaPiEvs, "AOD", "HFTOOMEPIEV",
Expand Down Expand Up @@ -200,7 +199,7 @@ DECLARE_SOA_TABLE(HfKfOmegacFulls, "AOD", "HFKFOMEGACFULL",
full::V0Ndf, full::CascNdf, full::OmegacNdf,
full::MassV0Ndf, full::MassCascNdf,
full::V0Chi2OverNdf, full::CascChi2OverNdf, full::OmegacChi2OverNdf,
full::MassV0Chi2OverNdf, full::MassCascChi2OverNdf, full::CascRejectInvmass, full::OutputMlOmegac,
full::MassV0Chi2OverNdf, full::MassCascChi2OverNdf, full::CascRejectInvmass,
full::FlagMcMatchRec, full::OriginRec, full::CollisionMatched, hf_track_index::HFflag);

DECLARE_SOA_TABLE(HfKfOmegacLites, "AOD", "HFKFOMEGACLITE",
Expand All @@ -216,9 +215,6 @@ DECLARE_SOA_TABLE(HfKfOmegacLites, "AOD", "HFKFOMEGACLITE",
full::V0Chi2OverNdf, full::CascChi2OverNdf, full::OmegacChi2OverNdf,
full::CascRejectInvmass,
full::FlagMcMatchRec, full::OriginRec, full::CollisionMatched, hf_track_index::HFflag);

DECLARE_SOA_TABLE(HfKfOmegacMl, "AOD", "HFKFOMEGACML",
full::InvMassCharmBaryon, full::KfptOmegac, full::KfptPiFromOmegac, full::OutputMlOmegac, full::FlagMcMatchRec, full::OriginRec, full::CollisionMatched, hf_track_index::HFflag);
} // namespace o2::aod

/// Writes the full information in an output TTree
Expand All @@ -227,7 +223,6 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
Produces<o2::aod::HfOmegac0ToOmegaPiLites> rowCandidateLite;
Produces<o2::aod::HfKfOmegacFulls> rowKfCandidateFull;
Produces<o2::aod::HfKfOmegacLites> rowKfCandidateLite;
Produces<o2::aod::HfKfOmegacMl> rowKfCandidateMl;
Produces<o2::aod::HfToOmegaPiEvs> rowEv;

Configurable<float> zPvCut{"zPvCut", 10., "Cut on absolute value of primary vertex z coordinate"};
Expand Down Expand Up @@ -387,7 +382,6 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
candidate.massV0Chi2OverNdf(),
candidate.massCascChi2OverNdf(),
candidate.cascRejectInvmass(),
candidate.mlValueOmegac(),
flagMc,
originMc,
collisionMatched,
Expand Down Expand Up @@ -438,23 +432,6 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
}
} // fillKfCandidateLite end

template <typename T>
void fillKfCandidateMl(const T& candidate, int8_t flagMc, int8_t originMc, bool collisionMatched)
{
if (candidate.resultSelections() && candidate.statusPidCharmBaryon() && candidate.statusInvMassLambda() && candidate.statusInvMassCascade() && candidate.statusInvMassCharmBaryon()) {

rowKfCandidateMl(
candidate.invMassCharmBaryon(),
candidate.kfptOmegac(),
candidate.kfptPiFromOmegac(),
candidate.mlValueOmegac(),
flagMc,
originMc,
collisionMatched,
candidate.hfflag());
}
} // fillCandidateMl end

void processDataLite(Colls const& collisions, Tracks const&,
soa::Filtered<soa::Join<aod::HfCandToOmegaPi, aod::HfSelToOmegaPi>> const& candidates)
{
Expand Down Expand Up @@ -504,22 +481,6 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
}
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKfDataLite, "Process KF data Lite", false);

void processKfCandidateMl(Colls const& collisions, Tracks const&, CandKfSel const& candidates)
{
// Filling event properties
rowEv.reserve(collisions.size());
for (const auto& collision : collisions) {
fillEvent(collision, zPvCut);
}

// Filling candidate properties
rowKfCandidateFull.reserve(candidates.size());
for (const auto& candidate : candidates) {
fillKfCandidateMl(candidate, -7, RecoDecay::OriginType::None, false);
}
}
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKfCandidateMl, "Process KF data ML", true);

void processMcLite(Colls const& collisions, Tracks const&,
soa::Filtered<soa::Join<aod::HfCandToOmegaPi, aod::HfSelToOmegaPi, aod::HfToOmegaPiMCRec>> const& candidates)
{
Expand Down
Loading