Skip to content

[PWGHF] Fix data type for D+ and Ds tables. #11162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhangbiao-phy merged 3 commits into from
May 13, 2025
Merged

[PWGHF] Fix data type for D+ and Ds tables. #11162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6975ff3
Fix data type for D+ and Ds tables.
May 12, 2025
415f3ad
Fix proton PID in reduced data creator.
May 13, 2025
5d2bf95
Rename data type and fix reduced data creator.
May 13, 2025
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
2 changes: 1 addition & 1 deletion PWGHF/D2H/TableProducer/converterReducedHadronDausPid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct HfConverterReducedHadronDausPid {
Produces<aod::HfRedPidDau2s_001> hfRedPidDau2s;

using HfRedPidDaus2Prong = soa::Join<aod::HfCand2ProngWPid, aod::HfRedPidDau0s_000, aod::HfRedPidDau1s_000>;
using HfRedPidDaus3Prong = soa::Join<aod::HfCand3ProngWPid, aod::HfRedPidDau0s_000, aod::HfRedPidDau1s_000, aod::HfRedPidDau2s_000>;
using HfRedPidDaus3Prong = soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfRedPidDau0s_000, aod::HfRedPidDau1s_000, aod::HfRedPidDau2s_000>;

void process2Prongs(HfRedPidDaus2Prong::iterator const& hfCandPidProngs)
{
Expand Down
29 changes: 20 additions & 9 deletions PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,14 @@ struct HfDataCreatorCharmHadPiReduced {
using TracksPidWithSel = soa::Join<aod::TracksWCovDcaExtra, TracksPid, aod::TrackSelection>;
using TracksPidWithSelAndMc = soa::Join<TracksPidWithSel, aod::McTrackLabels>;

using CandsDplusFiltered = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDplusToPiKPi>>;
using CandsDplusFilteredWithMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using CandsDsFiltered = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDsToKKPi>>;
using CandsDsFilteredWithMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDsToKKPi, aod::HfMlDsToKKPi>>;
using CandsDplusFiltered = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDplusToPiKPi>>;
using CandsDplusFilteredWithMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using CandsDsFiltered = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDsToKKPi>>;
using CandsDsFilteredWithMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDsToKKPi, aod::HfMlDsToKKPi>>;
using CandsD0Filtered = soa::Filtered<soa::Join<aod::HfCand2ProngWPid, aod::HfSelD0>>;
using CandsD0FilteredWithMl = soa::Filtered<soa::Join<aod::HfCand2ProngWPid, aod::HfSelD0, aod::HfMlD0>>;
using CandsLcFiltered = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelLc>>;
using CandsLcFilteredWithMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelLc, aod::HfMlLcToPKPi>>;
using CandsLcFiltered = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelLc>>;
using CandsLcFilteredWithMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelLc, aod::HfMlLcToPKPi>>;

using CollisionsWCent = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFT0Cs>;
using CollisionsWCentAndMcLabels = soa::Join<CollisionsWCent, aod::McCollisionLabels>;
Expand Down Expand Up @@ -1137,9 +1137,20 @@ struct HfDataCreatorCharmHadPiReduced {
trackParCovCharmHad.getSigmaTglSnp(), trackParCovCharmHad.getSigmaTgl2(),
trackParCovCharmHad.getSigma1PtY(), trackParCovCharmHad.getSigma1PtZ(), trackParCovCharmHad.getSigma1PtSnp(),
trackParCovCharmHad.getSigma1PtTgl(), trackParCovCharmHad.getSigma1Pt2());
hfCandPidProng0(candC.nSigTpcPi0(), candC.nSigTofPi0(), candC.nSigTpcKa0(), candC.nSigTofKa0(), candC.nSigTpcPr0(), candC.nSigTofPr0(), charmHadDauTracks[0].hasTOF(), charmHadDauTracks[0].hasTPC());
hfCandPidProng1(candC.nSigTpcPi1(), candC.nSigTofPi1(), candC.nSigTpcKa1(), candC.nSigTofKa1(), candC.nSigTpcPr1(), candC.nSigTofPr1(), charmHadDauTracks[1].hasTOF(), charmHadDauTracks[1].hasTPC());
hfCandPidProng2(candC.nSigTpcPi2(), candC.nSigTofPi2(), candC.nSigTpcKa2(), candC.nSigTofKa2(), candC.nSigTpcPr2(), candC.nSigTofPr2(), charmHadDauTracks[2].hasTOF(), charmHadDauTracks[2].hasTPC());
float nSigmaTpcPr0{-999.f}, nSigmaTpcPr1{-999.f}, nSigmaTpcPr2{-999.f};
float nSigmaTofPr0{-999.f}, nSigmaTofPr1{-999.f}, nSigmaTofPr2{-999.f};
if constexpr (decChannel == DecayChannel::LbToLcplusPi) {
/// assign non-dummy values only for Lb->LcPi analysis
nSigmaTpcPr0 = candC.nSigTpcPr0();
nSigmaTpcPr1 = candC.nSigTpcPr1();
nSigmaTpcPr2 = candC.nSigTpcPr2();
nSigmaTofPr0 = candC.nSigTofPr0();
nSigmaTofPr1 = candC.nSigTofPr1();
nSigmaTofPr2 = candC.nSigTofPr2();
}
hfCandPidProng0(candC.nSigTpcPi0(), candC.nSigTofPi0(), candC.nSigTpcKa0(), candC.nSigTofKa0(), nSigmaTpcPr0, nSigmaTofPr0, charmHadDauTracks[0].hasTOF(), charmHadDauTracks[0].hasTPC());
hfCandPidProng1(candC.nSigTpcPi1(), candC.nSigTofPi1(), candC.nSigTpcKa1(), candC.nSigTofKa1(), nSigmaTpcPr1, nSigmaTofPr1, charmHadDauTracks[1].hasTOF(), charmHadDauTracks[1].hasTPC());
hfCandPidProng2(candC.nSigTpcPi2(), candC.nSigTofPi2(), candC.nSigTpcKa2(), candC.nSigTofKa2(), nSigmaTpcPr2, nSigmaTofPr2, charmHadDauTracks[2].hasTOF(), charmHadDauTracks[2].hasTPC());
if constexpr (withMl) {
std::array<float, 6> mlScores = {-1.f, -1.f, -1.f, -1.f, -1.f, -1.f};
if constexpr (decChannel == DecayChannel::B0ToDminusPi) {
Expand Down
10 changes: 5 additions & 5 deletions PWGHF/D2H/Tasks/taskXic.cxx
View file
Open in desktop
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/D2H/Tasks/taskXic.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

Declare struct members in the conventional order. See the PWGHF coding guidelines.
// 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 @@ -49,7 +49,7 @@

// THnSparse for ML outputScores and Vars
Configurable<bool> enableTHn{"enableTHn", false, "enable THn for Xic"};
ConfigurableAxis thnConfigAxisPt{"thnConfigAxisPt", {36, 0, 36}, ""};

Check failure on line 52 in PWGHF/D2H/Tasks/taskXic.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

HfTaskXic: ConfigurableAxis appears too early (before end of Partition<).
ConfigurableAxis thnConfigAxisMass{"thnConfigAxisMass", {300, 1.98, 2.58}, ""};
ConfigurableAxis thnConfigAxisPtProng{"thnConfigAxisPtProng", {100, 0, 20}, ""};
ConfigurableAxis thnConfigAxisChi2PCA{"thnConfigAxisChi2PCA", {100, 0, 20}, ""};
Expand All @@ -60,7 +60,7 @@
ConfigurableAxis thnConfigAxisBdtScoreSignal{"thnConfigAxisBdtScoreSignal", {100, 0., 1.}, ""};
ConfigurableAxis thnConfigAxisYMC{"thnConfigAxisYMC", {100, -2., 2.}, ""};
//
Service<o2::framework::O2DatabasePDG> pdg;

Check failure on line 63 in PWGHF/D2H/Tasks/taskXic.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

HfTaskXic: Service< appears too early (before end of HfHelper).
HfHelper hfHelper;

float etaMaxAcceptance = 0.8;
Expand All @@ -71,7 +71,7 @@

Filter filterSelectCandidates = (aod::hf_sel_candidate_xic::isSelXicToPKPi >= selectionFlagXic || aod::hf_sel_candidate_xic::isSelXicToPiKP >= selectionFlagXic);

Partition<soa::Join<aod::HfCand3ProngWPid, aod::HfSelXicToPKPi, aod::HfCand3ProngMcRec>> selectedMCXicCandidates = (aod::hf_sel_candidate_xic::isSelXicToPKPi >= selectionFlagXic || aod::hf_sel_candidate_xic::isSelXicToPiKP >= selectionFlagXic);
Partition<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelXicToPKPi, aod::HfCand3ProngMcRec>> selectedMCXicCandidates = (aod::hf_sel_candidate_xic::isSelXicToPKPi >= selectionFlagXic || aod::hf_sel_candidate_xic::isSelXicToPiKP >= selectionFlagXic);

HistogramRegistry registry{
"registry", // histo not in pt bins
Expand Down Expand Up @@ -357,7 +357,7 @@
if (candidate.isSelXicToPKPi() >= selectionFlagXic) {
massXic = hfHelper.invMassXicToPKPi(candidate);
if constexpr (useMl) {
if (candidate.mlProbXicToPKPi().size() == 3) {

Check failure on line 360 in PWGHF/D2H/Tasks/taskXic.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
outputBkg = candidate.mlProbXicToPKPi()[0]; /// bkg score
outputPrompt = candidate.mlProbXicToPKPi()[1]; /// prompt score
outputFD = candidate.mlProbXicToPKPi()[2]; /// non-prompt score
Expand All @@ -371,7 +371,7 @@
if (candidate.isSelXicToPiKP() >= selectionFlagXic) {
massXic = hfHelper.invMassXicToPiKP(candidate);
if constexpr (useMl) {
if (candidate.mlProbXicToPiKP().size() == 3) {

Check failure on line 374 in PWGHF/D2H/Tasks/taskXic.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
outputBkg = candidate.mlProbXicToPiKP()[0]; /// bkg score
outputPrompt = candidate.mlProbXicToPiKP()[1]; /// prompt score
outputFD = candidate.mlProbXicToPiKP()[2]; /// non-prompt score
Expand All @@ -387,15 +387,15 @@
} // end process data

void processDataStd(aod::Collision const& collision,
soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelXicToPKPi>> const& candidates,
soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelXicToPKPi>> const& candidates,
TracksWPid const& tracks)
{
analysisData<false>(collision, candidates, tracks);
}
PROCESS_SWITCH(HfTaskXic, processDataStd, "Process Data with the standard method", true);

void processDataWithMl(aod::Collision const& collision,
soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelXicToPKPi, aod::HfMlXicToPKPi>> const& candidatesMl, TracksWPid const& tracks)
soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelXicToPKPi, aod::HfMlXicToPKPi>> const& candidatesMl, TracksWPid const& tracks)
{
analysisData<true>(collision, candidatesMl, tracks);
}
Expand Down Expand Up @@ -504,7 +504,7 @@
}
allProngsInAcceptance = isProngInAcceptance(etaProngs[0], ptProngs[0]) && isProngInAcceptance(etaProngs[1], ptProngs[1]) && isProngInAcceptance(etaProngs[2], ptProngs[2]);
if constexpr (useMl) {
if (candidate.mlProbXicToPKPi().size() == 3) {

Check failure on line 507 in PWGHF/D2H/Tasks/taskXic.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
outputBkg = candidate.mlProbXicToPKPi()[0]; /// bkg score
outputPrompt = candidate.mlProbXicToPKPi()[1]; /// prompt score
outputFD = candidate.mlProbXicToPKPi()[2]; /// non-prompt score
Expand All @@ -525,7 +525,7 @@
}
allProngsInAcceptance = isProngInAcceptance(etaProngs[0], ptProngs[0]) && isProngInAcceptance(etaProngs[1], ptProngs[1]) && isProngInAcceptance(etaProngs[2], ptProngs[2]);
if constexpr (useMl) {
if (candidate.mlProbXicToPiKP().size() == 3) {

Check failure on line 528 in PWGHF/D2H/Tasks/taskXic.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
outputBkg = candidate.mlProbXicToPiKP()[0]; /// bkg score
outputPrompt = candidate.mlProbXicToPiKP()[1]; /// prompt score
outputFD = candidate.mlProbXicToPiKP()[2]; /// non-prompt score
Expand Down Expand Up @@ -600,15 +600,15 @@
}
}
}
void processMcStd(soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelXicToPKPi, aod::HfCand3ProngMcRec>> const& selectedCandidatesMc,
void processMcStd(soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelXicToPKPi, aod::HfCand3ProngMcRec>> const& selectedCandidatesMc,
soa::Join<aod::McParticles, aod::HfCand3ProngMcGen> const& mcParticles,
aod::TracksWMc const& tracksWithMc)
{
analysisMc<false>(selectedCandidatesMc, mcParticles, tracksWithMc);
}
PROCESS_SWITCH(HfTaskXic, processMcStd, "Process MC with the standard method", false);

void processMcWithMl(soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelXicToPKPi, aod::HfMlXicToPKPi, aod::HfCand3ProngMcRec>> const& selectedCandidatesMlMc,
void processMcWithMl(soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelXicToPKPi, aod::HfMlXicToPKPi, aod::HfCand3ProngMcRec>> const& selectedCandidatesMlMc,
soa::Join<aod::McParticles, aod::HfCand3ProngMcGen> const& mcParticles,
aod::TracksWMc const& tracksWithMc)
{
Expand Down
3 changes: 2 additions & 1 deletion PWGHF/DataModel/CandidateReconstructionTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,8 @@ DECLARE_SOA_EXTENDED_TABLE_USER(HfCand3ProngExt, HfCand3ProngBase, "HFCAND3PEXT"
hf_cand_3prong::Px, hf_cand_3prong::Py, hf_cand_3prong::Pz);

using HfCand3Prong = HfCand3ProngExt;
using HfCand3ProngWPid = soa::Join<HfCand3Prong, HfProng0PidPi, HfProng0PidPr, HfProng0PidKa, HfProng1PidPi, HfProng1PidPr, HfProng1PidKa, HfProng2PidPi, HfProng2PidPr, HfProng2PidKa>;
using HfCand3ProngWPidPiKaPr = soa::Join<HfCand3Prong, HfProng0PidPi, HfProng0PidPr, HfProng0PidKa, HfProng1PidPi, HfProng1PidPr, HfProng1PidKa, HfProng2PidPi, HfProng2PidPr, HfProng2PidKa>;
using HfCand3ProngWPidPiKa = soa::Join<HfCand3Prong, HfProng0PidPi, HfProng0PidKa, HfProng1PidPi, HfProng1PidKa, HfProng2PidPi, HfProng2PidKa>;

DECLARE_SOA_TABLE(HfCand3ProngKF, "AOD", "HFCAND3PKF",
hf_cand_3prong::KfXError, hf_cand_3prong::KfYError, hf_cand_3prong::KfZError,
Expand Down
4 changes: 2 additions & 2 deletions PWGHF/HFC/TableProducer/femtoDreamProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ struct HfFemtoDreamProducer {

float magField;
int runNumber;
using CandidateLc = soa::Join<aod::HfCand3ProngWPid, aod::HfSelLc>;
using CandidateLcMc = soa::Join<aod::HfCand3ProngWPid, aod::HfSelLc, aod::HfCand3ProngMcRec>;
using CandidateLc = soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelLc>;
using CandidateLcMc = soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelLc, aod::HfCand3ProngMcRec>;

using FemtoFullCollision = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Ms>::iterator;
using FemtoFullCollisionMc = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Ms, aod::McCollisionLabels>::iterator;
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateSelectorDplusToPiKPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ struct HfCandidateSelectorDplusToPiKPi {
return true;
}

void process(aod::HfCand3ProngWPid const& candidates,
void process(aod::HfCand3ProngWPidPiKa const& candidates,
TracksSel const&)
{
// looping over 3-prong candidates
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateSelectorDsToKKPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ struct HfCandidateSelectorDsToKKPi {
return true;
}

void process(aod::HfCand3ProngWPid const& candidates,
void process(aod::HfCand3ProngWPidPiKa const& candidates,
TracksSel const&)
{
// looping over 3-prong candidates
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/TableProducer/candidateSelectorLc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ struct HfCandidateSelectorLc {
/// \brief process function w/o Bayes PID with DCAFitterN
/// \param candidates Lc candidate table
/// \param tracks track table
void processNoBayesPidWithDCAFitterN(aod::HfCand3ProngWPid const& candidates,
void processNoBayesPidWithDCAFitterN(aod::HfCand3ProngWPidPiKaPr const& candidates,
TracksSel const& tracks)
{
runSelectLc<false, aod::hf_cand::VertexerType::DCAFitter>(candidates, tracks);
Expand All @@ -598,7 +598,7 @@ struct HfCandidateSelectorLc {
/// \brief process function with Bayes PID with DCAFitterN
/// \param candidates Lc candidate table
/// \param tracks track table with Bayes PID information
void processBayesPidWithDCAFitterN(aod::HfCand3ProngWPid const& candidates,
void processBayesPidWithDCAFitterN(aod::HfCand3ProngWPidPiKaPr const& candidates,
TracksSelBayesPid const& tracks)
{
runSelectLc<true, aod::hf_cand::VertexerType::DCAFitter>(candidates, tracks);
Expand All @@ -608,7 +608,7 @@ struct HfCandidateSelectorLc {
/// \brief process function w/o Bayes PID with KFParticle
/// \param candidates Lc candidate table
/// \param tracks track table
void processNoBayesPidWithKFParticle(soa::Join<aod::HfCand3ProngWPid, aod::HfCand3ProngKF> const& candidates,
void processNoBayesPidWithKFParticle(soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfCand3ProngKF> const& candidates,
TracksSel const& tracks)
{
runSelectLc<false, aod::hf_cand::VertexerType::KfParticle>(candidates, tracks);
Expand All @@ -618,7 +618,7 @@ struct HfCandidateSelectorLc {
/// \brief process function with Bayes PID with KFParticle
/// \param candidates Lc candidate table
/// \param tracks track table with Bayes PID information
void processBayesPidWithKFParticle(soa::Join<aod::HfCand3ProngWPid, aod::HfCand3ProngKF> const& candidates,
void processBayesPidWithKFParticle(soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfCand3ProngKF> const& candidates,
TracksSelBayesPid const& tracks)
{
runSelectLc<true, aod::hf_cand::VertexerType::KfParticle>(candidates, tracks);
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateSelectorLcPidMl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
}
}

void process(aod::HfCand3ProngWPid const& candidates,
void process(aod::HfCand3ProngWPidPiKaPr const& candidates,
TracksSel const&)
{
// looping over 3-prong candidates
Expand Down Expand Up @@ -271,13 +271,13 @@
const float massLc = o2::constants::physics::MassLambdaCPlus;
if (statusLcToPiKP == 1) {
auto invMassLcToPiKP = RecoDecay::m(std::array{pVecPos1, pVecNeg, pVecPos2}, std::array{massPi, massK, massProton});
if (std::abs(invMassLcToPiKP - massLc) >= maxDeltaMass && candidate.pt() < 10) {

Check failure on line 274 in PWGHF/TableProducer/candidateSelectorLcPidMl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
statusLcToPiKP = 0;
}
}
if (statusLcToPKPi == 1) {
auto invMassLcToPKPi = RecoDecay::m(std::array{pVecPos1, pVecNeg, pVecPos2}, std::array{massProton, massK, massPi});
if (std::abs(invMassLcToPKPi - massLc) >= maxDeltaMass && candidate.pt() < 10) {

Check failure on line 280 in PWGHF/TableProducer/candidateSelectorLcPidMl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
statusLcToPKPi = 0;
}
}
Expand All @@ -291,7 +291,7 @@
float scores[3] = {-1.f, -1.f, -1.f};
if (dataTypeML == 1) {
auto scoresRaw = model.evalModel(inputFeaturesF);
for (int iScore = 0; iScore < 3; ++iScore) {

Check failure on line 294 in PWGHF/TableProducer/candidateSelectorLcPidMl.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
scores[iScore] = scoresRaw[iScore];
}
} else if (dataTypeML == 11) {
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/TableProducer/candidateSelectorXicToPKPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ struct HfCandidateSelectorXicToPKPi {
return true;
}

void process(aod::HfCand3ProngWPid const& candidates,
void process(aod::HfCand3ProngWPidPiKaPr const& candidates,
TracksSel const&)
{
// looping over 3-prong candidates
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/TableProducer/derivedDataCreatorDplusToPiKPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ struct HfDerivedDataCreatorDplusToPiKPi {
using CollisionsWCentMult = soa::Join<aod::Collisions, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::PVMultZeqs>;
using CollisionsWMcCentMult = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::PVMultZeqs>;
using TracksWPid = soa::Join<aod::Tracks, aod::TracksPidPi, aod::PidTpcTofFullPi, aod::TracksPidKa, aod::PidTpcTofFullKa>;
using SelectedCandidates = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDplusToPiKPi>>;
using SelectedCandidatesMc = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfCand3ProngMcRec, aod::HfSelDplusToPiKPi>>;
using SelectedCandidatesMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using SelectedCandidatesMcMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfCand3ProngMcRec, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using SelectedCandidates = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDplusToPiKPi>>;
using SelectedCandidatesMc = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfCand3ProngMcRec, aod::HfSelDplusToPiKPi>>;
using SelectedCandidatesMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using SelectedCandidatesMcMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfCand3ProngMcRec, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using MatchedGenCandidatesMc = soa::Filtered<soa::Join<aod::McParticles, aod::HfCand3ProngMcGen>>;
using TypeMcCollisions = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;

Expand Down
8 changes: 4 additions & 4 deletions PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ struct HfDerivedDataCreatorLcToPKPi {
using CollisionsWCentMult = soa::Join<aod::Collisions, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::PVMultZeqs>;
using CollisionsWMcCentMult = soa::Join<aod::Collisions, aod::McCollisionLabels, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::PVMultZeqs>;
using TracksWPid = soa::Join<aod::Tracks, aod::TracksPidPi, aod::PidTpcTofFullPi, aod::TracksPidKa, aod::PidTpcTofFullKa, aod::TracksPidPr, aod::PidTpcTofFullPr>;
using SelectedCandidates = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelLc>>;
using SelectedCandidatesMc = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfCand3ProngMcRec, aod::HfSelLc>>;
using SelectedCandidatesMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelLc, aod::HfMlLcToPKPi>>;
using SelectedCandidatesMcMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfCand3ProngMcRec, aod::HfSelLc, aod::HfMlLcToPKPi>>;
using SelectedCandidates = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelLc>>;
using SelectedCandidatesMc = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfCand3ProngMcRec, aod::HfSelLc>>;
using SelectedCandidatesMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelLc, aod::HfMlLcToPKPi>>;
using SelectedCandidatesMcMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfCand3ProngMcRec, aod::HfSelLc, aod::HfMlLcToPKPi>>;
using MatchedGenCandidatesMc = soa::Filtered<soa::Join<aod::McParticles, aod::HfCand3ProngMcGen>>;
using TypeMcCollisions = soa::Join<aod::McCollisions, aod::McCentFT0Ms>;

Expand Down
8 changes: 4 additions & 4 deletions PWGHF/TableProducer/treeCreatorDplusToPiKPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ struct HfTreeCreatorDplusToPiKPi {

HfHelper hfHelper;

using SelectedCandidatesMc = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfCand3ProngMcRec, aod::HfSelDplusToPiKPi>>;
using SelectedCandidatesMc = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfCand3ProngMcRec, aod::HfSelDplusToPiKPi>>;
using MatchedGenCandidatesMc = soa::Filtered<soa::Join<aod::McParticles, aod::HfCand3ProngMcGen>>;
using SelectedCandidatesMcWithMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfCand3ProngMcRec, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using SelectedCandidatesMcWithMl = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfCand3ProngMcRec, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using TracksWPid = soa::Join<aod::Tracks, aod::TracksPidPi, aod::PidTpcTofFullPi, aod::TracksPidKa, aod::PidTpcTofFullKa>;

using CollisionsCent = soa::Join<aod::Collisions, aod::CentFT0Cs, aod::CentFT0Ms>;
Expand Down Expand Up @@ -452,7 +452,7 @@ struct HfTreeCreatorDplusToPiKPi {
}

void processData(aod::Collisions const& collisions,
soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDplusToPiKPi>> const& candidates,
soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDplusToPiKPi>> const& candidates,
TracksWPid const&)
{
// Filling event properties
Expand Down Expand Up @@ -481,7 +481,7 @@ struct HfTreeCreatorDplusToPiKPi {
PROCESS_SWITCH(HfTreeCreatorDplusToPiKPi, processData, "Process data", true);

void processDataWCent(CollisionsCent const& collisions,
soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDplusToPiKPi>> const& candidates,
soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDplusToPiKPi>> const& candidates,
TracksWPid const&)
{
// Filling event properties
Expand Down
4 changes: 2 additions & 2 deletions PWGHF/TableProducer/treeCreatorDsToKKPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ struct HfTreeCreatorDsToKKPi {

HfHelper hfHelper;

using CandDsData = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDsToKKPi>>;
using CandDsMcReco = soa::Filtered<soa::Join<aod::HfCand3ProngWPid, aod::HfSelDsToKKPi, aod::HfCand3ProngMcRec>>;
using CandDsData = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDsToKKPi>>;
using CandDsMcReco = soa::Filtered<soa::Join<aod::HfCand3ProngWPidPiKa, aod::HfSelDsToKKPi, aod::HfCand3ProngMcRec>>;
using CandDsMcGen = soa::Filtered<soa::Join<aod::McParticles, aod::HfCand3ProngMcGen>>;
using TracksWPid = soa::Join<aod::Tracks, aod::TracksPidPi, aod::PidTpcTofFullPi, aod::TracksPidKa, aod::PidTpcTofFullKa>;

Expand Down
4 changes: 2 additions & 2 deletions PWGHF/TableProducer/treeCreatorLbToLcPi.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ struct HfTreeCreatorLbToLcPi {
using TracksWPid = soa::Join<aod::Tracks, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr>;

void process(soa::Join<aod::HfCandLb, aod::HfSelLbToLcPi> const& candidates,
soa::Join<aod::HfCand3ProngWPid, aod::HfSelLc> const&,
soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelLc> const&,
TracksWPid const&)
{
// Filling candidate properties
Expand All @@ -202,7 +202,7 @@ struct HfTreeCreatorLbToLcPi {
float FunctionInvMass,
float FunctionCt,
float FunctionY) {
auto candLc = candidate.prong0_as<soa::Join<aod::HfCand3ProngWPid, aod::HfSelLc>>();
auto candLc = candidate.prong0_as<soa::Join<aod::HfCand3ProngWPidPiKaPr, aod::HfSelLc>>();
auto track0 = candidate.prong1_as<TracksWPid>(); // daughter pion track
auto track1 = candLc.prong0_as<TracksWPid>(); // granddaughter tracks (lc decay particles)
auto track2 = candLc.prong1_as<TracksWPid>();
Expand Down
Loading
Loading