Skip to content

Commit aa263d0

Browse files
FDUEnrichalibuild
andauthored
[PWGHF] Fix vector error in candidateSelectorOmegac0ToOmegaPi.cxx (#11286)
Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent 6640ae5 commit aa263d0

File tree

3 files changed

+4
-46
lines changed

3 files changed

+4
-46
lines changed

PWGHF/DataModel/CandidateSelectionTables.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,13 +393,12 @@ DECLARE_SOA_COLUMN(PidTpcInfoStored, pidTpcInfoStored, int);
393393
DECLARE_SOA_COLUMN(PidTofInfoStored, pidTofInfoStored, int);
394394
// Machine learning column for omegac0 to omega pi
395395
DECLARE_SOA_COLUMN(MlProbOmegac, mlProbOmegac, std::vector<float>);
396-
DECLARE_SOA_COLUMN(MlValueOmegac, mlValueOmegac, float);
397396
} // namespace hf_sel_toomegapi
398397

399398
DECLARE_SOA_TABLE(HfSelToOmegaPi, "AOD", "HFSELTOOMEPI",
400399
hf_sel_toomegapi::StatusPidLambda, hf_sel_toomegapi::StatusPidCascade, hf_sel_toomegapi::StatusPidCharmBaryon,
401400
hf_sel_toomegapi::StatusInvMassLambda, hf_sel_toomegapi::StatusInvMassCascade, hf_sel_toomegapi::StatusInvMassCharmBaryon,
402-
hf_sel_toomegapi::ResultSelections, hf_sel_toomegapi::PidTpcInfoStored, hf_sel_toomegapi::PidTofInfoStored, hf_sel_toomegapi::MlValueOmegac,
401+
hf_sel_toomegapi::ResultSelections, hf_sel_toomegapi::PidTpcInfoStored, hf_sel_toomegapi::PidTofInfoStored,
403402
hf_sel_toomegapi::TpcNSigmaPiFromCharmBaryon, hf_sel_toomegapi::TpcNSigmaKaFromCasc, hf_sel_toomegapi::TpcNSigmaPiFromLambda, hf_sel_toomegapi::TpcNSigmaPrFromLambda,
404403
hf_sel_toomegapi::TofNSigmaPiFromCharmBaryon, hf_sel_toomegapi::TofNSigmaKaFromCasc, hf_sel_toomegapi::TofNSigmaPiFromLambda, hf_sel_toomegapi::TofNSigmaPrFromLambda);
405404

PWGHF/TableProducer/candidateSelectorOmegac0ToOmegaPi.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ struct HfCandidateSelectorToOmegaPi {
354354
// pt-dependent selection
355355
if (!selectionTopol(candidate)) {
356356
resultSelections = false;
357-
hfSelToOmegaPi(statusPidLambda, statusPidCascade, statusPidCharmBaryon, statusInvMassLambda, statusInvMassCascade, statusInvMassCharmBaryon, resultSelections, infoTpcStored, infoTofStored, outputMlOmegac[0],
357+
hfSelToOmegaPi(statusPidLambda, statusPidCascade, statusPidCharmBaryon, statusInvMassLambda, statusInvMassCascade, statusInvMassCharmBaryon, resultSelections, infoTpcStored, infoTofStored,
358358
trackPiFromCharm.tpcNSigmaPi(), trackKaFromCasc.tpcNSigmaKa(), trackPiFromLam.tpcNSigmaPi(), trackPrFromLam.tpcNSigmaPr(),
359359
trackPiFromCharm.tofNSigmaPi(), trackKaFromCasc.tofNSigmaKa(), trackPiFromLam.tofNSigmaPi(), trackPrFromLam.tofNSigmaPr());
360360
if constexpr (ConstructMethod == hf_cand_casc_lf::ConstructMethod::KfParticle) {
@@ -746,14 +746,12 @@ struct HfCandidateSelectorToOmegaPi {
746746
isSelectedMlOmegac = hfMlResponse.isSelectedMl(inputFeaturesOmegaC, ptCand, outputMlOmegac);
747747
if (isSelectedMlOmegac) {
748748
registry.fill(HIST("hBDTScoreTest1"), outputMlOmegac[0]);
749-
} else {
750-
resultSelections = false;
751749
}
752750
hfMlSelToOmegaPi(outputMlOmegac);
753751
}
754752
}
755753

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

PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ DECLARE_SOA_COLUMN(OmegacChi2OverNdf, omegacChi2OverNdf, float);
152152
DECLARE_SOA_COLUMN(MassV0Chi2OverNdf, massV0Chi2OverNdf, float);
153153
DECLARE_SOA_COLUMN(MassCascChi2OverNdf, massCascChi2OverNdf, float);
154154
DECLARE_SOA_COLUMN(CascRejectInvmass, cascRejectInvmass, float);
155-
DECLARE_SOA_COLUMN(OutputMlOmegac, outputMlOmegac, float);
156155
} // namespace full
157156

158157
DECLARE_SOA_TABLE(HfToOmegaPiEvs, "AOD", "HFTOOMEPIEV",
@@ -200,7 +199,7 @@ DECLARE_SOA_TABLE(HfKfOmegacFulls, "AOD", "HFKFOMEGACFULL",
200199
full::V0Ndf, full::CascNdf, full::OmegacNdf,
201200
full::MassV0Ndf, full::MassCascNdf,
202201
full::V0Chi2OverNdf, full::CascChi2OverNdf, full::OmegacChi2OverNdf,
203-
full::MassV0Chi2OverNdf, full::MassCascChi2OverNdf, full::CascRejectInvmass, full::OutputMlOmegac,
202+
full::MassV0Chi2OverNdf, full::MassCascChi2OverNdf, full::CascRejectInvmass,
204203
full::FlagMcMatchRec, full::OriginRec, full::CollisionMatched, hf_track_index::HFflag);
205204

206205
DECLARE_SOA_TABLE(HfKfOmegacLites, "AOD", "HFKFOMEGACLITE",
@@ -216,9 +215,6 @@ DECLARE_SOA_TABLE(HfKfOmegacLites, "AOD", "HFKFOMEGACLITE",
216215
full::V0Chi2OverNdf, full::CascChi2OverNdf, full::OmegacChi2OverNdf,
217216
full::CascRejectInvmass,
218217
full::FlagMcMatchRec, full::OriginRec, full::CollisionMatched, hf_track_index::HFflag);
219-
220-
DECLARE_SOA_TABLE(HfKfOmegacMl, "AOD", "HFKFOMEGACML",
221-
full::InvMassCharmBaryon, full::KfptOmegac, full::KfptPiFromOmegac, full::OutputMlOmegac, full::FlagMcMatchRec, full::OriginRec, full::CollisionMatched, hf_track_index::HFflag);
222218
} // namespace o2::aod
223219

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

233228
Configurable<float> zPvCut{"zPvCut", 10., "Cut on absolute value of primary vertex z coordinate"};
@@ -387,7 +382,6 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
387382
candidate.massV0Chi2OverNdf(),
388383
candidate.massCascChi2OverNdf(),
389384
candidate.cascRejectInvmass(),
390-
candidate.mlValueOmegac(),
391385
flagMc,
392386
originMc,
393387
collisionMatched,
@@ -438,23 +432,6 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
438432
}
439433
} // fillKfCandidateLite end
440434

441-
template <typename T>
442-
void fillKfCandidateMl(const T& candidate, int8_t flagMc, int8_t originMc, bool collisionMatched)
443-
{
444-
if (candidate.resultSelections() && candidate.statusPidCharmBaryon() && candidate.statusInvMassLambda() && candidate.statusInvMassCascade() && candidate.statusInvMassCharmBaryon()) {
445-
446-
rowKfCandidateMl(
447-
candidate.invMassCharmBaryon(),
448-
candidate.kfptOmegac(),
449-
candidate.kfptPiFromOmegac(),
450-
candidate.mlValueOmegac(),
451-
flagMc,
452-
originMc,
453-
collisionMatched,
454-
candidate.hfflag());
455-
}
456-
} // fillCandidateMl end
457-
458435
void processDataLite(Colls const& collisions, Tracks const&,
459436
soa::Filtered<soa::Join<aod::HfCandToOmegaPi, aod::HfSelToOmegaPi>> const& candidates)
460437
{
@@ -504,22 +481,6 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
504481
}
505482
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKfDataLite, "Process KF data Lite", false);
506483

507-
void processKfCandidateMl(Colls const& collisions, Tracks const&, CandKfSel const& candidates)
508-
{
509-
// Filling event properties
510-
rowEv.reserve(collisions.size());
511-
for (const auto& collision : collisions) {
512-
fillEvent(collision, zPvCut);
513-
}
514-
515-
// Filling candidate properties
516-
rowKfCandidateFull.reserve(candidates.size());
517-
for (const auto& candidate : candidates) {
518-
fillKfCandidateMl(candidate, -7, RecoDecay::OriginType::None, false);
519-
}
520-
}
521-
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKfCandidateMl, "Process KF data ML", true);
522-
523484
void processMcLite(Colls const& collisions, Tracks const&,
524485
soa::Filtered<soa::Join<aod::HfCandToOmegaPi, aod::HfSelToOmegaPi, aod::HfToOmegaPiMCRec>> const& candidates)
525486
{

0 commit comments

Comments
 (0)