Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9a39814
Added table producer example
nicola-wilson May 14, 2026
8e49699
PWGJE: add tableDiffWake task
nicola-wilson Jun 5, 2026
b6b1b56
PWGJE: add tableDiffWake task - restored myExample
nicola-wilson Jun 8, 2026
5edc2ad
Updated format tableDiffWake
nicola-wilson Jun 8, 2026
25d674a
Updated format tableDiffWake 2
nicola-wilson Jun 8, 2026
13f091f
Updated format tableDiffWake 3
nicola-wilson Jun 8, 2026
e90d684
Updated format tableDiffWake 4
nicola-wilson Jun 8, 2026
6542d38
Change data types for several SOA columns
wirthni Jun 8, 2026
431f51b
Rename source files in CMakeLists.txt for jet workflows
wirthni Jun 8, 2026
2780af4
Fix formatting of P column declaration
wirthni Jun 8, 2026
e993d81
Please consider the following formatting changes
alibuild Jun 8, 2026
e74c748
Merge pull request #2 from alibuild/alibot-cleanup-16570
wirthni Jun 8, 2026
9ece9fb
Disable OSV Scanner
wirthni Jun 9, 2026
c139b63
Adjust pT axis and add momentum overflow checks
wirthni Jun 9, 2026
ba83b1e
Refactor tableDiffWake.cxx to clean up track properties
wirthni Jun 9, 2026
fd23dc5
Clean up includes and fix comment space
wirthni Jun 9, 2026
3205395
Refactor variable types for memory optimization
wirthni Jun 9, 2026
1b2127a
Refactor variable names for clarity in tableDiffWake
wirthni Jun 9, 2026
86d80c6
rewrote comments
wirthni Jun 9, 2026
2874fa1
Refactor configurable parameters in tableDiffWake
wirthni Jun 9, 2026
691c4f3
Enhance documentation in tableDiffWake.cxx
wirthni Jun 9, 2026
20a8eb1
Rename configurable variables and type alias
wirthni Jun 9, 2026
cf17915
Rename struct tableDiffWake to TableDiffWake
wirthni Jun 9, 2026
59f4542
Refactor casts to use static_cast
wirthni Jun 9, 2026
141512f
Remove REPOSITORY_OSV_SCANNER from mega-linter
wirthni Jun 9, 2026
cd6e89e
Refactor track iteration to use 'const auto&'
wirthni Jun 9, 2026
397e95e
Remove unnecessary comment section in tableDiffWake.cxx
wirthni Jun 9, 2026
45bfab2
Clean up comments in tableDiffWake.cxx
wirthni Jun 9, 2026
df6997d
Optimize particle momentum calculations using bitmasking
wirthni Jun 9, 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
23 changes: 14 additions & 9 deletions PWGJE/TableProducer/CMakeLists.txt
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 PWGJE/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Use kebab-case for names of workflows and match the name of the workflow file.
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
# All rights not expressly granted are reserved.
#
Expand All @@ -14,42 +14,42 @@
if(FastJet_FOUND)

o2physics_add_dpl_workflow(jet-deriveddata-producer
SOURCES derivedDataProducer.cxx
SOURCES jetDeriveddataProducer.cxx
Comment on lines 16 to +17

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.

These files are not modified in this PR.

PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils O2Physics::SGCutParHolder
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-deriveddata-trigger-producer
SOURCES derivedDataTriggerProducer.cxx
SOURCES jetDeriveddataTriggerProducer.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-deriveddata-selector
SOURCES derivedDataSelector.cxx
SOURCES jetDeriveddataSelector.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-deriveddata-writer
SOURCES derivedDataWriter.cxx
SOURCES jetDeriveddataWriter.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-luminosity-producer

Check failure on line 36 in PWGJE/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name jet-luminosity-producer does not match its file name jetLuminosityCalculator.cxx. (Matches jetLuminosityProducer.cxx.)
SOURCES luminosityProducer.cxx
SOURCES jetLuminosityCalculator.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-luminosity-calculator

Check failure on line 41 in PWGJE/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name jet-luminosity-calculator does not match its file name luminosityCalculator.cxx. (Matches jetLuminosityCalculator.cxx.)
SOURCES luminosityCalculator.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-eventweight-mcd
SOURCES jetEventWeightMCD.cxx
SOURCES jetEventweightMcd.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-eventweight-mcp
SOURCES jetEventWeightMCP.cxx
SOURCES jetEventweightMcp.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

Expand All @@ -64,26 +64,26 @@
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-hf-definition
SOURCES heavyFlavourDefinition.cxx
SOURCES jetHfDefinition.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-taggerhf
SOURCES jetTaggerHF.cxx
SOURCES jetTaggerhf.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2Physics::MLCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(estimator-rho

Check failure on line 76 in PWGJE/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name estimator-rho does not match its file name rhoEstimator.cxx. (Matches estimatorRho.cxx.)
SOURCES rhoEstimator.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(subtractor-eventwiseconstituent

Check failure on line 81 in PWGJE/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name subtractor-eventwiseconstituent does not match its file name eventwiseConstituentSubtractor.cxx. (Matches subtractorEventwiseconstituent.cxx.)
SOURCES eventwiseConstituentSubtractor.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-sv-reconstruction

Check failure on line 86 in PWGJE/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name jet-sv-reconstruction does not match its file name secondaryVertexReconstruction.cxx. (Matches jetSvReconstruction.cxx.)
SOURCES secondaryVertexReconstruction.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand All @@ -96,7 +96,7 @@
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2::EMCALBase O2::EMCALReconstruction O2::EMCALCalibration O2Physics::PWGJECore O2Physics::EventFilteringUtils
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(emcal-matchedtracks-writer

Check failure on line 99 in PWGJE/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name emcal-matchedtracks-writer does not match its file name emcalMatchedTracksTask.cxx. (Matches emcalMatchedtracksWriter.cxx.)
SOURCES emcalMatchedTracksTask.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2::EMCALBase O2::EMCALReconstruction
COMPONENT_NAME Analysis)
Expand All @@ -110,3 +110,8 @@
SOURCES slimTablesProducer.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(table-diff-wake
SOURCES tableDiffWake.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
269 changes: 269 additions & 0 deletions PWGJE/TableProducer/tableDiffWake.cxx

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.

This file is not a table definition, it's a table producer, so don't start the name with table....

Original file line number Diff line number Diff line change
@@ -0,0 +1,269 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
// This software is distributed under the terms of the GNU General Public
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
//
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
///
/// \file tableDiffWake.cxx
/// \brief This task writes a collision and track table which are further used in a diffusion wake analysis

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.

Where is the analysis task?

/// \author Nicola Wilson <nicola.wilson@cern.ch>

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/Core/EventPlaneHelper.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/Qvectors.h"
#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
// -------------------------------------------------------------------------------------------
// TRACK DATA
// -------------------------------------------------------------------------------------------
// BEFORE COMPRESSION AFTER COMPRESSION
// Name Data Type Size(b) Name Data Type Size(b)
// ColID int32_t 4 [same]
// Charge short 2 [same]
// Px, Py, Pz float 3x4 P unsigned long 8
// DEdx float 4 DEdx unsigned short 2
// DCAXY float 4 DCAXY short 2
// DCAZ float 4 DCAZ short 2
// Length float 4 Length unsigned short 2

// OVERALL COMPRESSION 34b->22b

// -------------------------------------------------------------------------------------------
// EVENT DATA
// -------------------------------------------------------------------------------------------
// GI int64_t 8 [same]
// RN int 4 [same]
// Cent float 4 [same]
// Mult int 4 [same]
// VertexX float 4 [same]
// VertexY float 4 [same]
// VertexZ float 4 [same]
// Psi2 float 4 Psi2 short 2
// Psi3 float 4 Psi3 short 2

// OVERALL COMPRESSION 40b->36b
//--------------------------------------------------------
namespace o2::aod
{
namespace testcol
{
// Event properties
// DECLARE_SOA_COLUMN(Gi, gi, int64_t);
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
DECLARE_SOA_COLUMN(Occu, occu, int32_t); // Occupancy ITS
DECLARE_SOA_COLUMN(Occuft0, occuft0, float); // Occupancy FT0C amplitudes
DECLARE_SOA_COLUMN(VertexX, vertexX, float);
DECLARE_SOA_COLUMN(VertexY, vertexY, float);
DECLARE_SOA_COLUMN(VertexZ, vertexZ, float);
DECLARE_SOA_COLUMN(Psi2, psi2, int16_t);
DECLARE_SOA_COLUMN(Psi3, psi3, int16_t);
} // namespace testcol

DECLARE_SOA_TABLE(TableCol, "AOD", "TABLECOL",
o2::soa::Index<>,
testcol::Rn,
testcol::Cent,
testcol::Mult,
testcol::Occu,
testcol::Occuft0,
testcol::VertexX,
testcol::VertexY,
testcol::VertexZ,
testcol::Psi2,
testcol::Psi3);
using Collision = TableCol::iterator;

namespace testtrack
{

// Track properties
DECLARE_SOA_INDEX_COLUMN(Collision, collision);
DECLARE_SOA_COLUMN(Charge, charge, int16_t);
DECLARE_SOA_COLUMN(P, p, uint64_t);
DECLARE_SOA_COLUMN(Dedx, dedx, uint16_t);
DECLARE_SOA_COLUMN(Dcaxy, dcaxy, int16_t);
DECLARE_SOA_COLUMN(Dcaz, dcaz, int16_t);
} // namespace testtrack

DECLARE_SOA_TABLE(TableTrack, "AOD", "TABLETRACK",
o2::soa::Index<>,
testtrack::CollisionId,
testtrack::Charge,
testtrack::P,
testtrack::Dedx,
testtrack::Dcaxy,
testtrack::Dcaz);
} // namespace o2::aod
//--------------------------------------------------------
using namespace o2;
using namespace o2::framework;

struct TableDiffWake {

HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
Configurable<int> nBinsPt{"nBinsPt", 100, "N bins in pT histo"};
Configurable<double> ptThresh{"ptThresh", 20.0, "pT threshold"};
Configurable<float> centMax{"centMax", 10, "centrality"};
Configurable<float> zVertCut{"zVertCut", 10.0, "z_vertex cut"};

Produces<o2::aod::TableCol> testcol;
Produces<o2::aod::TableTrack> testtrack;

EventPlaneHelper helperEP;

void init(InitContext const&)
{
const AxisSpec axisEta{30, -1.5, +1.5, "#eta"};
const AxisSpec axispT{nBinsPt, 0, 250, "p_{T}"};

histos.add("etaHistogram", "etaHistogram", kTH1F, {axisEta});
histos.add("pTHistogram", "pTHistogram", kTH1F, {axispT});
}

using Bcs = aod::BCs;

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 do you need this alias?

void process(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::TPCMults, aod::QvectorFT0Cs>::iterator const& col,
soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection> const& tracks,
Bcs const&)
{
const float maxMomentum = 173.0;

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.

Where does this come from?


// Event selection corresponds to sel8FullPbPb
if (!col.sel8())
return;
if (col.centFT0C() > centMax)
return; // Centrality 0 - 10 %
if (std::abs(col.posZ()) > zVertCut)
return; // z position < 10 cm
if (!col.selection_bit(o2::aod::evsel::kNoCollInRofStandard))
return;
if (!col.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard))
return;

//------ Get Run number ---------------------
auto bc = col.bc_as<Bcs>();
int run = bc.runNumber();
//------------ EP ---------------------------
double ep2 = 0.0;
double ep3 = 0.0;
ep2 = helperEP.GetEventPlane(col.qvecFT0CRe(), col.qvecFT0CIm(), 2);
ep3 = helperEP.GetEventPlane(col.qvecFT0CRe(), col.qvecFT0CIm(), 3);

//------- Only events with track above some thresh ----------

bool eventHighpT = false;
for (const auto& track : tracks) {

if (!track.isGlobalTrack())
continue;
if (track.pt() > ptThresh) {
eventHighpT = true;
break;
}
}
if (!eventHighpT)
return;
//------------------------------------------------------------
// Translate values to less memory consuming values
int16_t substituteEp2 = static_cast<int16_t>(ep2 * 1000);
int16_t substituteEp3 = static_cast<int16_t>(ep3 * 1000);

testcol(col.globalIndex(),
run,
col.centFT0C(),
col.multTPC(),
col.trackOccupancyInTimeRange(),
col.ft0cOccupancyInTimeRange(),
col.posX(),
col.posY(),
col.posZ(),
substituteEp2,
substituteEp3);

for (const auto& track : tracks) {

// Track cut
if (!track.isGlobalTrack())
continue; // General track cuts

if (std::abs(track.px()) > maxMomentum || std::abs(track.py()) > maxMomentum || std::abs(track.pz()) > maxMomentum)
continue; // to avoid overflow in Substitute_p

histos.fill(HIST("etaHistogram"), track.eta());
histos.fill(HIST("pTHistogram"), track.pt());

//------------ Translate values to less memory consuming values --------------------

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.

it is a nice idea to do this type of packing, however, I see no guards against maximum values. Are you sure no reasonable values can cause an overflow of your bits allocated for packing?

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.

What is the reduction factor?

// Px, Py, Pz
uint64_t substituteP = 0;
uint8_t uppermostBit = 20;
uint8_t lowermostBit = 0;
uint64_t bitmask20Bits = 0b11111111111111111111;

int64_t particlePx = (track.px() * 6000);
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)
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)
substituteP |= static_cast<uint64_t>1 << uppermostBit;
if (particlePz < 0)
particlePz = (-1) * particlePz;
substituteP |= (particlePz & bitmask20Bits) << lowermostBit;

// dEdx
uint16_t substituteDEDX = static_cast<uint16_t>(track.tpcSignal() * 10);

// DCA
int16_t substituteDCAXY = static_cast<int16_t>(track.dcaXY() * 100);
int16_t substituteDCAZ = static_cast<int16_t>(track.dcaZ() * 100);

//--------------- Fill track table ------------------
testtrack(track.collisionId(),
track.sign(),
substituteP,
substituteDEDX,
substituteDCAXY,
substituteDCAZ);
}
}
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<TableDiffWake>(cfgc)};
}
Loading