Skip to content

[PWGJE] Refactor collision index handling in diffWakeTreeProducer #16842

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 9 commits into from
Jul 2, 2026
Merged

[PWGJE] Refactor collision index handling in diffWakeTreeProducer #16842

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88b57fa
Refactor collision index handling in diffWakeTreeProducer
wirthni Jun 27, 2026
12ea35b
Refactor conditional statements for particle momentum
wirthni Jun 27, 2026
8310b2e
Merge branch 'AliceO2Group:master' into table_branch_14May
nicola-wilson Jul 1, 2026
21d69a5
Fixed indexing
nicola-wilson Jul 1, 2026
e378cfe
fixed code-check errors
wirthni Jul 2, 2026
1320646
made includes flawless
wirthni Jul 2, 2026
935457e
Replace OutputObjHandlingPolicy with OutputObjHeader
wirthni Jul 2, 2026
084c945
Remove unused include statement
wirthni Jul 2, 2026
86c6415
Add include for Configurable in diffWakeTreeProducer
wirthni Jul 2, 2026
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
25 changes: 14 additions & 11 deletions PWGJE/TableProducer/diffWakeTreeProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@
#include "Common/DataModel/TrackSelectionTables.h"

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/InitContext.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>

// Event selection: Only events that contain track above some threshold
Expand Down Expand Up @@ -67,7 +65,7 @@ namespace o2::aod
namespace testcol
{
// Event properties
// DECLARE_SOA_COLUMN(Gi, gi, int64_t);
DECLARE_SOA_COLUMN(Ci, ci, int64_t); // Collision index - needed because is used as tree
Comment thread
nzardosh marked this conversation as resolved.
Outdated
DECLARE_SOA_COLUMN(Rn, rn, int32_t); // run number
DECLARE_SOA_COLUMN(Cent, cent, float); // FT0C centrality
DECLARE_SOA_COLUMN(Mult, mult, int32_t); // TPC multiplicity
Expand All @@ -82,6 +80,7 @@ DECLARE_SOA_COLUMN(Psi3, psi3, int16_t);

DECLARE_SOA_TABLE(TableCols, "AOD", "TABLECOL",
o2::soa::Index<>,
testcol::Ci,
testcol::Rn,
testcol::Cent,
testcol::Mult,
Expand All @@ -99,6 +98,7 @@ namespace testtrack

// Track properties
DECLARE_SOA_INDEX_COLUMN(TableCol, tableCol);
DECLARE_SOA_COLUMN(Ci, ci, int64_t); // is needed to link to collision when used as tree
DECLARE_SOA_COLUMN(Charge, charge, int16_t);
DECLARE_SOA_COLUMN(P, p, uint64_t);
DECLARE_SOA_COLUMN(Dedx, dedx, uint16_t);
Expand All @@ -109,6 +109,7 @@ DECLARE_SOA_COLUMN(Dcaz, dcaz, int16_t);
DECLARE_SOA_TABLE(TableTrack, "AOD", "TABLETRACK",
o2::soa::Index<>,
testtrack::TableColId,
testtrack::Ci,
testtrack::Charge,
testtrack::P,
testtrack::Dedx,
Expand Down Expand Up @@ -196,7 +197,8 @@ struct DiffWakeTreeProducer {
int16_t substituteEp2 = static_cast<int16_t>(ep2 * 1000);
int16_t substituteEp3 = static_cast<int16_t>(ep3 * 1000);

testcol(run,
testcol(collisionCounter,
run,
col.centFT0C(),
col.multTPC(),
col.trackOccupancyInTimeRange(),
Expand Down Expand Up @@ -231,28 +233,28 @@ struct DiffWakeTreeProducer {
uint64_t bitmask20Bits = 0b11111111111111111111;

int64_t particlePx = (track.px() * 6000);
if (particlePx < 0)
if (particlePx < 0) {
substituteP |= static_cast<uint64_t>(1) << uppermostBit;
if (particlePx < 0)
particlePx = (-1) * particlePx;
}
substituteP |= (particlePx & bitmask20Bits) << lowermostBit;

uppermostBit = 41;
lowermostBit = 21;
int64_t particlePy = (track.py() * 6000);
if (particlePy < 0)
if (particlePy < 0) {
substituteP |= static_cast<uint64_t>(1) << uppermostBit;
if (particlePy < 0)
particlePy = (-1) * particlePy;
}
substituteP |= (particlePy & bitmask20Bits) << lowermostBit;

uppermostBit = 62;
lowermostBit = 42;
int64_t particlePz = (track.pz() * 6000);
if (particlePz < 0)
if (particlePz < 0) {
substituteP |= static_cast<uint64_t>(1) << uppermostBit;
if (particlePz < 0)
particlePz = (-1) * particlePz;
}
substituteP |= (particlePz & bitmask20Bits) << lowermostBit;

// dEdx
Expand All @@ -263,7 +265,8 @@ struct DiffWakeTreeProducer {
int16_t substituteDCAZ = static_cast<int16_t>(track.dcaZ() * 100);

//--------------- Fill track table ------------------
testtrack(collisionCounter,
testtrack(testcol.lastIndex(),
collisionCounter,
track.sign(),
substituteP,
substituteDEDX,
Expand Down
Loading