Skip to content

[PWGJE] adding secondary vertex coloumns for dielectrons at generator level #14461

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
nzardosh merged 1 commit into from
Jan 12, 2026
+10 −2
Merged

[PWGJE] adding secondary vertex coloumns for dielectrons at generator level #14461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 PWGJE/Core/JetDQUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ void fillDielectronCandidateTable(T const& candidate, int32_t collisionIndex, U&
template <typename T, typename U>
void fillDielectronCandidateMcTable(T const& candidate, int32_t mcCollisionIndex, U& DielectronMcTable)
{
DielectronMcTable(mcCollisionIndex, candidate.pt(), candidate.eta(), candidate.phi(), candidate.y(), candidate.e(), candidate.m(), candidate.pdgCode(), candidate.statusCode(), candidate.flags(), candidate.decayFlag(), candidate.origin());
DielectronMcTable(mcCollisionIndex, candidate.pt(), candidate.eta(), candidate.phi(), candidate.y(), candidate.e(), candidate.m(), candidate.vx(), candidate.vy(), candidate.vz(), candidate.vt(), candidate.pdgCode(), candidate.statusCode(), candidate.flags(), candidate.decayFlag(), candidate.origin());
}

}; // namespace jetdqutilities
Expand Down
8 changes: 8 additions & 0 deletions PWGJE/DataModel/JetReducedDataDQ.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

namespace jdielectronindices
{
DECLARE_SOA_INDEX_COLUMN_CUSTOM(JDielectronMcCollision, dielectronmccollision, "JDIELMCCOLLS");

Check failure on line 47 in PWGJE/DataModel/JetReducedDataDQ.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, JTracks, "_0");
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, JTracks, "_1");
} // namespace jdielectronindices
Expand All @@ -71,6 +71,10 @@
DECLARE_SOA_COLUMN(Y, y, float);
DECLARE_SOA_COLUMN(E, e, float);
DECLARE_SOA_COLUMN(M, m, float);
DECLARE_SOA_COLUMN(Vx, vx, float);
DECLARE_SOA_COLUMN(Vy, vy, float);
DECLARE_SOA_COLUMN(Vz, vz, float);
DECLARE_SOA_COLUMN(Vt, vt, float);
DECLARE_SOA_COLUMN(PdgCode, pdgCode, int);
DECLARE_SOA_COLUMN(StatusCode, statusCode, int);
DECLARE_SOA_COLUMN(Flags, flags, uint8_t);
Expand Down Expand Up @@ -112,6 +116,10 @@
jdielectronmc::Y,
jdielectronmc::E,
jdielectronmc::M,
jdielectronmc::Vx,
jdielectronmc::Vy,
jdielectronmc::Vz,
jdielectronmc::Vt,
jdielectronmc::PdgCode,
jdielectronmc::StatusCode,
jdielectronmc::Flags,
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/TableProducer/derivedDataProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,14 +509,14 @@
std::vector<int32_t> mothersId;
if (particle.has_mothers()) {
auto mothersIdTemps = particle.mothersIds();
for (auto mothersIdTemp : mothersIdTemps) {

Check failure on line 512 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
mothersId.push_back(mothersIdTemp);
}
}
int daughtersId[2] = {-1, -1};
if (particle.has_daughters()) {
auto i = 0;
for (auto daughterId : particle.daughtersIds()) {

Check failure on line 519 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (i > 1) {
break;
}
Expand All @@ -532,7 +532,7 @@
void processClusters(aod::Collision const&, aod::EMCALClusters const& clusters, aod::EMCALClusterCells const& cells, aod::Calos const&, aod::EMCALMatchedTracks const& matchedTracks, soa::Join<aod::Tracks, aod::TracksExtra> const&)
{

for (auto cluster : clusters) {

Check failure on line 535 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.

auto const clusterCells = cells.sliceBy(preslices.perClusterCells, cluster.globalIndex());

Expand Down Expand Up @@ -572,7 +572,7 @@
void processMcClusterLabels(aod::EMCALMCCluster const& cluster)
{
std::vector<int32_t> particleIds;
for (auto particleId : cluster.mcParticleIds()) {

Check failure on line 575 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
particleIds.push_back(particleId);
}
std::vector<float> amplitudeA;
Expand Down Expand Up @@ -867,14 +867,14 @@
std::vector<int32_t> mothersId;
if (particle.has_mothers()) {
auto mothersIdTemps = particle.mothersIds();
for (auto mothersIdTemp : mothersIdTemps) {

Check failure on line 870 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
mothersId.push_back(mothersIdTemp);
}
}
int daughtersId[2] = {-1, -1};
if (particle.has_daughters()) {
auto i = 0;
for (auto daughterId : particle.daughtersIds()) {

Check failure on line 877 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (i > 1) {
break;
}
Expand Down Expand Up @@ -921,14 +921,14 @@
std::vector<int32_t> mothersId;
if (particle.has_mothers()) {
auto mothersIdTemps = particle.mothersIds();
for (auto mothersIdTemp : mothersIdTemps) {

Check failure on line 924 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
mothersId.push_back(mothersIdTemp);
}
}
int daughtersId[2] = {-1, -1};
if (particle.has_daughters()) {
auto i = 0;
for (auto daughterId : particle.daughtersIds()) {

Check failure on line 931 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (i > 1) {
break;
}
Expand All @@ -937,7 +937,7 @@
}
}
auto pdgParticle = pdgDatabase->GetParticle(particle.pdgCode());
products.jDielectronMcsTable(products.jDielectronMcCollisionsTable.lastIndex(), particle.pt(), particle.eta(), particle.phi(), particle.y(), particle.e(), pdgParticle->Mass(), particle.pdgCode(), particle.statusCode(), particle.flags(), jetdqutilities::setDielectronParticleDecayBit(particles, particle), RecoDecay::getCharmHadronOrigin(particles, particle, false)); // Todo: should the last thing be false?
products.jDielectronMcsTable(products.jDielectronMcCollisionsTable.lastIndex(), particle.pt(), particle.eta(), particle.phi(), particle.y(), particle.e(), pdgParticle->Mass(), particle.vx(), particle.vy(), particle.vz(), particle.vt(), particle.pdgCode(), particle.statusCode(), particle.flags(), jetdqutilities::setDielectronParticleDecayBit(particles, particle), RecoDecay::getCharmHadronOrigin(particles, particle, false)); // Todo: should the last thing be false?
products.jDielectronMcIdsTable(mcCollision.globalIndex(), particle.globalIndex(), mothersId, daughtersId);
products.JDielectronMcRCollDummysTable(false);
}
Expand All @@ -949,5 +949,5 @@
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<JetDerivedDataProducerTask>(cfgc, TaskName{"jet-deriveddata-producer"})};

Check failure on line 952 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-task] 

Specified task name jet-deriveddata-producer produces device name jet-deriveddata-producer which does not match the device name jet-derived-data-producer-task from the struct name JetDerivedDataProducerTask. (Matching struct name JetDeriveddataProducer)
}
Loading