Skip to content
Open
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
8 changes: 4 additions & 4 deletions PWGJE/Core/JetTaggingUtilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,8 @@ uint16_t setTaggingSVBit(T const& jet, U const& prongs, V prongChi2PCAMin, V pro
* @param trackPtMin Minimum value of track pT.
* @return The number of vertices (clusters) in the jet.
*/
template <typename AnyCollision, typename AnalysisJet, typename AnyTracks, typename AnyParticles, typename AnyOriginalParticles>
int vertexClustering(AnyCollision const& collision, AnalysisJet const& jet, AnyTracks const&, AnyParticles const& particles, AnyOriginalParticles const&, std::unordered_map<std::string, std::vector<int>>& trkLabels, bool searchUpToQuark, float vtxResParam = 0.01 /* 0.01cm = 100um */, float trackPtMin = 0.5)
template <typename AnyCollision, typename AnalysisJet, typename AnyTracks, typename AnyParticles>
int vertexClustering(AnyCollision const& collision, AnalysisJet const& jet, AnyTracks const&, AnyParticles const& particles, std::unordered_map<std::string, std::vector<int>>& trkLabels, bool searchUpToQuark, float vtxResParam = 0.01 /* 0.01cm = 100um */, float trackPtMin = 0.5)
{
const auto& tracks = jet.template tracks_as<AnyTracks>();
const int nTrks = tracks.size();
Expand Down Expand Up @@ -880,7 +880,7 @@ int vertexClustering(AnyCollision const& collision, AnalysisJet const& jet, AnyT

if (tj < nTrks) {
if (tracks[tj].has_mcParticle()) {
const auto& pj = tracks[tj].template mcParticle_as<AnyParticles>().template mcParticle_as<AnyOriginalParticles>();
const auto& pj = tracks[tj].template mcParticle_as<AnyParticles>();
posj = std::array<float, 3>{pj.vx(), pj.vy(), pj.vz()};
} else {
dists[trkPairIdx(ti, tj)] = std::numeric_limits<float>::max();
Expand All @@ -891,7 +891,7 @@ int vertexClustering(AnyCollision const& collision, AnalysisJet const& jet, AnyT
}

if (tracks[ti].has_mcParticle()) {
const auto& pi = tracks[ti].template mcParticle_as<AnyParticles>().template mcParticle_as<AnyOriginalParticles>();
const auto& pi = tracks[ti].template mcParticle_as<AnyParticles>();
posi = std::array<float, 3>{pi.vx(), pi.vy(), pi.vz()};
} else {
dists[trkPairIdx(ti, tj)] = std::numeric_limits<float>::max();
Expand Down
6 changes: 6 additions & 0 deletions PWGJE/DataModel/JetReducedData.h
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,9 @@ DECLARE_SOA_COLUMN(E, e, float);
DECLARE_SOA_COLUMN(PdgCode, pdgCode, int);
DECLARE_SOA_COLUMN(StatusCode, statusCode, int);
DECLARE_SOA_COLUMN(Flags, flags, uint8_t);
DECLARE_SOA_COLUMN(Vx, vx, float);
DECLARE_SOA_COLUMN(Vy, vy, float);
DECLARE_SOA_COLUMN(Vz, vz, float);

DECLARE_SOA_SELF_ARRAY_INDEX_COLUMN(Mothers, mothers);
DECLARE_SOA_SELF_SLICE_INDEX_COLUMN(Daughters, daughters);
Expand Down Expand Up @@ -415,6 +418,9 @@ DECLARE_SOA_TABLE_STAGED(JMcParticles, "JMCPARTICLE",
jmcparticle::PdgCode,
jmcparticle::StatusCode,
jmcparticle::Flags,
jmcparticle::Vx,
jmcparticle::Vy,
jmcparticle::Vz,
jmcparticle::MothersIds,
jmcparticle::DaughtersIdSlice,
jmcparticle::Px<jmcparticle::Pt, jmcparticle::Phi>,
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/TableProducer/derivedDataProducer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ struct JetDerivedDataProducerTask {
i++;
}
}
products.jMcParticlesTable(particle.mcCollisionId(), particle.pt(), particle.eta(), particle.phi(), particle.y(), particle.e(), particle.pdgCode(), particle.statusCode(), particle.flags(), mothersId, daughtersId);
products.jMcParticlesTable(particle.mcCollisionId(), particle.pt(), particle.eta(), particle.phi(), particle.y(), particle.e(), particle.pdgCode(), particle.statusCode(), particle.flags(), particle.vx(), particle.vy(), particle.vz(), mothersId, daughtersId);
products.jParticlesParentIndexTable(particle.globalIndex());
}
PROCESS_SWITCH(JetDerivedDataProducerTask, processParticles, "produces derived parrticle table", false);
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/TableProducer/derivedDataProducerEmbedding.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ struct JetDerivedDataEmbeddingProducerTask {
i++;
}
}
products.jMcParticlesTable(particle.mcCollisionId(), particle.pt(), particle.eta(), particle.phi(), particle.y(), particle.e(), particle.pdgCode(), particle.statusCode(), particle.flags(), mothersId, daughtersId);
products.jMcParticlesTable(particle.mcCollisionId(), particle.pt(), particle.eta(), particle.phi(), particle.y(), particle.e(), particle.pdgCode(), particle.statusCode(), particle.flags(), particle.vx(), particle.vy(), particle.vz(), mothersId, daughtersId);
products.jParticlesParentIndexTable(particle.globalIndex());
}
PROCESS_SWITCH(JetDerivedDataEmbeddingProducerTask, processParticles, "produces derived parrticle table", true);
Expand Down
6 changes: 5 additions & 1 deletion PWGJE/TableProducer/derivedDataWriter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,10 @@ struct JetDerivedDataWriter {
const auto particlesPerMcCollision = particles.sliceBy(preslices.ParticlesPerMcCollision, mcCollision.globalIndex());

for (const auto& particle : particlesPerMcCollision) {
// Assign output indices only to particles that will actually be stored.
if (!config.savePartonLevelInfo && !particle.isPhysicalPrimary()) {
continue;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this added here? Does it hurt to have the full mapping?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @nzardosh, I'm sorry for making a PR without any discussion with you.
The particleMapping vector provides processTracksMcParticleLabel() with the output particle indices assigned by processMcParticles(). When config.savePartonLevelInfo == false, only physical primary particles are stored in StoredJMcParticles table. If the mapping assigns indices to all particles, skipping non-physical primary particles during storage causes the mapped indices to differ from the actual output row indices, resulting in incorrect MC particle references in the stored track labels.

}
particleMapping[particle.globalIndex()] = particleTableIndex;
particleTableIndex++;
}
Expand Down Expand Up @@ -770,7 +774,7 @@ struct JetDerivedDataWriter {
continue;
}
}
products.storedJMcParticlesTable(mcCollisionMapping[mcCollision.globalIndex()], o2::math_utils::detail::truncateFloatFraction(particle.pt(), precisionMomentumMask), o2::math_utils::detail::truncateFloatFraction(particle.eta(), precisionPositionMask), o2::math_utils::detail::truncateFloatFraction(particle.phi(), precisionPositionMask), o2::math_utils::detail::truncateFloatFraction(particle.y(), precisionPositionMask), o2::math_utils::detail::truncateFloatFraction(particle.e(), precisionMomentumMask), particle.pdgCode(), particle.statusCode(), particle.flags(), mothersIds, daughtersIds);
products.storedJMcParticlesTable(mcCollisionMapping[mcCollision.globalIndex()], o2::math_utils::detail::truncateFloatFraction(particle.pt(), precisionMomentumMask), o2::math_utils::detail::truncateFloatFraction(particle.eta(), precisionPositionMask), o2::math_utils::detail::truncateFloatFraction(particle.phi(), precisionPositionMask), o2::math_utils::detail::truncateFloatFraction(particle.y(), precisionPositionMask), o2::math_utils::detail::truncateFloatFraction(particle.e(), precisionMomentumMask), particle.pdgCode(), particle.statusCode(), particle.flags(), o2::math_utils::detail::truncateFloatFraction(particle.vx(), precisionPositionMask), o2::math_utils::detail::truncateFloatFraction(particle.vy(), precisionPositionMask), o2::math_utils::detail::truncateFloatFraction(particle.vz(), precisionPositionMask), mothersIds, daughtersIds);
products.storedJParticlesParentIndexTable(particle.mcParticleId());
}
}
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/TableProducer/jetGnnDefinition.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ struct JetGnnDefinitionTask {
}
PROCESS_SWITCH(JetGnnDefinitionTask, processData, "Produce GNN track indices for data jets", false);

void processMcd(CollisionsMcd::iterator const& collision, AnalysisJets const& jets, JetTracksExt const& tracks, McCollisions const&, JetParticlesWithIds const& particles, aod::McParticles const& originalParticles)
void processMcd(CollisionsMcd::iterator const& collision, AnalysisJets const& jets, JetTracksExt const& tracks, McCollisions const&, JetParticlesWithIds const& particles)
{
if constexpr (isMCD) {
bool acceptedCollision = isAcceptedCollision(collision);
Expand All @@ -231,7 +231,7 @@ struct JetGnnDefinitionTask {
// tree creator. Project these labels onto the selected GNN nodes.
std::unordered_map<std::string, std::vector<int>> trackLabels{{"trkVtxIndex", {}}, {"trkOrigin", {}}};
if (collision.has_mcCollision()) {
jettaggingutilities::vertexClustering(collision.template mcCollision_as<McCollisions>(), jet, tracks, particles, originalParticles, trackLabels, searchUpToQuark, vtxRes, trackPtMin);
jettaggingutilities::vertexClustering(collision.template mcCollision_as<McCollisions>(), jet, tracks, particles, trackLabels, searchUpToQuark, vtxRes, trackPtMin);
origins = std::move(trackLabels.at("trkOrigin"));
vertexIndices = std::move(trackLabels.at("trkVtxIndex"));
} else {
Expand Down
Loading