Skip to content

[PWGHF] Fix track vector type + minor fixes #11908

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
fgrosa merged 3 commits into from
Jul 3, 2025
Merged

[PWGHF] Fix track vector type + minor fixes #11908

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c967280
Fix track vector type + minor fixes
fgrosa Jul 3, 2025
c18064c
Make the linter very very very happy
fgrosa Jul 3, 2025
d490cfa
Make the linter very very very happy
fgrosa Jul 3, 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
48 changes: 24 additions & 24 deletions PWGHF/D2H/TableProducer/dataCreatorCharmResoReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ struct HfDataCreatorCharmResoReduced {
using CandsDplusFilteredWithMl = soa::Filtered<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfMlDplusToPiKPi>>;
using CandsDstarFiltered = soa::Filtered<soa::Join<aod::HfD0FromDstar, aod::HfCandDstars, aod::HfSelDstarToD0Pi>>;
using CandsDstarFilteredWithMl = soa::Filtered<soa::Join<aod::HfD0FromDstar, aod::HfCandDstars, aod::HfSelDstarToD0Pi, aod::HfMlDstarToD0Pi>>;
using CandsD0Filtered = soa::Filtered<soa::Join<aod::HfCand2ProngWPid, aod::HfSelD0>>;
using CandsD0FilteredWithMl = soa::Filtered<soa::Join<aod::HfCand2ProngWPid, aod::HfSelD0, aod::HfMlD0>>;
using CandsD0Filtered = soa::Filtered<soa::Join<aod::HfCand2Prong, aod::HfSelD0>>;
using CandsD0FilteredWithMl = soa::Filtered<soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfMlD0>>;
using TracksWithPID = soa::Join<aod::Tracks, aod::TracksCov, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr>;
using TracksIUWithPID = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksCovIU, aod::pidTPCPi, aod::pidTOFFullPi, aod::pidTPCPr, aod::pidTOFFullPr>;
using TracksIUWithPIDAndMC = soa::Join<TracksIUWithPID, aod::McTrackLabels>;
Expand Down Expand Up @@ -840,8 +840,8 @@ struct HfDataCreatorCharmResoReduced {
std::map<int64_t, int64_t> selectedV0s;
std::map<int64_t, int64_t> selectedTracks;
bool fillHfReducedCollision = false;
const bool doTracks = pairingType == PairingType::TrackOnly || pairingType == PairingType::V0AndTrack;
const bool doV0s = pairingType == PairingType::V0Only || pairingType == PairingType::V0AndTrack;
constexpr bool DoTracks = pairingType == PairingType::TrackOnly || pairingType == PairingType::V0AndTrack;
constexpr bool DoV0s = pairingType == PairingType::V0Only || pairingType == PairingType::V0AndTrack;
auto bc = collision.template bc_as<aod::BCsWithTimestamps>();
if (runNumber != bc.runNumber()) {
LOG(info) << ">>>>>>>>>>>> Current run number: " << runNumber;
Expand All @@ -858,7 +858,7 @@ struct HfDataCreatorCharmResoReduced {
std::array<int, 3> prongIdsD;
int8_t dtype{0};
std::array<float, 6> bdtScores = {-1.f, -1.f, -1.f, -1.f, -1.f, -1.f};
std::vector<typename TrIU::iterator> charmHadDauTracks{};
std::vector<std::decay_t<typename TrIU::iterator>> charmHadDauTracks{};
varUtils.ptD = candD.pt();
if constexpr (dType == DType::Dstar) {
varUtils.signD = candD.signSoftPi();
Expand Down Expand Up @@ -943,7 +943,7 @@ struct HfDataCreatorCharmResoReduced {
}

// Loop on the bachelor V0s
if constexpr (doV0s) {
if constexpr (DoV0s) {
for (const auto& v0 : bachelorV0s) {
auto trackPos = v0.template posTrack_as<TrIU>();
auto trackNeg = v0.template negTrack_as<TrIU>();
Expand Down Expand Up @@ -1082,7 +1082,7 @@ struct HfDataCreatorCharmResoReduced {
fillHfCandD = true;
// Optional filling of MC Rec table, for now only implemented for Ds1->D*K0s and Ds2*->D+K0s
if constexpr (doMc && (dType == DType::Dstar || dType == DType::Dplus)) {
std::vector<typename Tr::iterator> charmResoDauTracks{};
std::vector<std::decay_t<typename TrIU::iterator>> charmResoDauTracks{};
for (const auto& track : charmHadDauTracks) {
charmResoDauTracks.push_back(track);
}
Expand All @@ -1095,7 +1095,7 @@ struct HfDataCreatorCharmResoReduced {
} // end of loop on V0 candidates
} // end of do V0s
// Loop on the bachelor tracks
if constexpr (doTracks) {
if constexpr (DoTracks) {
for (const auto& trackIndex : bachelorTrks) {
auto track = tracks.rawIteratorAt(trackIndex.trackId());
if (!isTrackSelected(track, prongIdsD)) {
Expand Down Expand Up @@ -1485,7 +1485,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDstar.sliceBy(candsDstarPerCollision, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<false, false, DType::Dstar, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, tracksIU, bcs);
runDataCreation<false, false, DType::Dstar, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand All @@ -1509,7 +1509,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDstar.sliceBy(candsDstarPerCollision, thisCollId);
auto trackIdsThisColl = trackIndices.sliceBy(trackIndicesPerCollision, thisCollId);
runDataCreation<false, false, DType::Dstar, PairingType::TrackOnly>(collision, candsDThisColl, trackIdsThisColl, trackIdsThisColl, tracks, tracks, tracks, bcs);
runDataCreation<false, false, DType::Dstar, PairingType::TrackOnly>(collision, candsDThisColl, nullptr, trackIdsThisColl, tracks, tracks, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand Down Expand Up @@ -1559,7 +1559,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDplus.sliceBy(candsDplusPerCollision, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<false, false, DType::Dplus, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, tracksIU, bcs);
runDataCreation<false, false, DType::Dplus, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand All @@ -1583,7 +1583,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDplus.sliceBy(candsDplusPerCollision, thisCollId);
auto trackIdsThisColl = trackIndices.sliceBy(trackIndicesPerCollision, thisCollId);
runDataCreation<false, false, DType::Dplus, PairingType::TrackOnly>(collision, candsDThisColl, trackIdsThisColl, trackIdsThisColl, tracks, tracks, tracks, bcs);
runDataCreation<false, false, DType::Dplus, PairingType::TrackOnly>(collision, candsDThisColl, nullptr, trackIdsThisColl, tracks, tracks, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand Down Expand Up @@ -1633,7 +1633,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsD0.sliceBy(candsD0PerCollision, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<false, false, DType::D0, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, tracksIU, bcs);
runDataCreation<false, false, DType::D0, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand All @@ -1657,7 +1657,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsD0.sliceBy(candsD0PerCollision, thisCollId);
auto trackIdsThisColl = trackIndices.sliceBy(trackIndicesPerCollision, thisCollId);
runDataCreation<false, false, DType::D0, PairingType::TrackOnly>(collision, candsDThisColl, trackIdsThisColl, trackIdsThisColl, tracks, tracks, tracks, bcs);
runDataCreation<false, false, DType::D0, PairingType::TrackOnly>(collision, candsDThisColl, nullptr, trackIdsThisColl, tracks, tracks, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand Down Expand Up @@ -1709,7 +1709,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDstar.sliceBy(candsDstarPerCollision, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<false, true, DType::Dstar, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, particlesMc, bcs);
runDataCreation<false, true, DType::Dstar, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, particlesMc, bcs);
}
runMcGen<DecayChannel::DstarV0>(particlesMc);
// handle normalization by the right number of collisions
Expand All @@ -1735,7 +1735,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDplus.sliceBy(candsDplusPerCollision, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<false, true, DType::Dplus, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, particlesMc, bcs);
runDataCreation<false, true, DType::Dplus, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, particlesMc, bcs);
}
runMcGen<DecayChannel::DplusV0>(particlesMc);
// handle normalization by the right number of collisions
Expand Down Expand Up @@ -1764,7 +1764,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDstar.sliceBy(candsDstarPerCollisionWithMl, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<true, false, DType::Dstar, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, tracksIU, bcs);
runDataCreation<true, false, DType::Dstar, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand All @@ -1788,7 +1788,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDstar.sliceBy(candsDstarPerCollisionWithMl, thisCollId);
auto trackIdsThisColl = trackIndices.sliceBy(trackIndicesPerCollision, thisCollId);
runDataCreation<true, false, DType::Dstar, PairingType::TrackOnly>(collision, candsDThisColl, trackIdsThisColl, trackIdsThisColl, tracks, tracks, tracks, bcs);
runDataCreation<true, false, DType::Dstar, PairingType::TrackOnly>(collision, candsDThisColl, nullptr, trackIdsThisColl, tracks, tracks, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand Down Expand Up @@ -1838,7 +1838,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDplus.sliceBy(candsDplusPerCollisionWithMl, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<true, false, DType::Dplus, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, tracksIU, bcs);
runDataCreation<true, false, DType::Dplus, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand All @@ -1862,7 +1862,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDplus.sliceBy(candsDplusPerCollisionWithMl, thisCollId);
auto trackIdsThisColl = trackIndices.sliceBy(trackIndicesPerCollision, thisCollId);
runDataCreation<true, false, DType::Dplus, PairingType::TrackOnly>(collision, candsDThisColl, trackIdsThisColl, trackIdsThisColl, tracks, tracks, tracks, bcs);
runDataCreation<true, false, DType::Dplus, PairingType::TrackOnly>(collision, candsDThisColl, nullptr, trackIdsThisColl, tracks, tracks, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand Down Expand Up @@ -1912,7 +1912,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsD0.sliceBy(candsD0PerCollisionWithMl, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<true, false, DType::D0, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, tracksIU, bcs);
runDataCreation<true, false, DType::D0, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand All @@ -1936,7 +1936,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsD0.sliceBy(candsD0PerCollisionWithMl, thisCollId);
auto trackIdsThisColl = trackIndices.sliceBy(trackIndicesPerCollision, thisCollId);
runDataCreation<true, false, DType::D0, PairingType::TrackOnly>(collision, candsDThisColl, trackIdsThisColl, trackIdsThisColl, tracks, tracks, tracks, bcs);
runDataCreation<true, false, DType::D0, PairingType::TrackOnly>(collision, candsDThisColl, nullptr, trackIdsThisColl, tracks, tracks, nullptr, bcs);
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
Expand Down Expand Up @@ -1988,7 +1988,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDstar.sliceBy(candsDstarPerCollision, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<true, true, DType::Dstar, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, particlesMc, bcs);
runDataCreation<true, true, DType::Dstar, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, particlesMc, bcs);
}
runMcGen<DecayChannel::DstarV0>(particlesMc);
// handle normalization by the right number of collisions
Expand All @@ -2014,7 +2014,7 @@ struct HfDataCreatorCharmResoReduced {
auto thisCollId = collision.globalIndex();
auto candsDThisColl = candsDplus.sliceBy(candsDplusPerCollision, thisCollId);
auto v0sThisColl = v0s.sliceBy(candsV0PerCollision, thisCollId);
runDataCreation<true, true, DType::Dplus, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, v0sThisColl, tracksIU, tracksIU, particlesMc, bcs);
runDataCreation<true, true, DType::Dplus, PairingType::V0Only>(collision, candsDThisColl, v0sThisColl, nullptr, tracksIU, tracksIU, particlesMc, bcs);
}
runMcGen<DecayChannel::DplusV0>(particlesMc);
// handle normalization by the right number of collisions
Expand Down
Loading