From 9d8a8a7a261b6b3a70b7d1bca73468301595578c Mon Sep 17 00:00:00 2001 From: louisemillot Date: Wed, 26 Nov 2025 17:15:37 +0100 Subject: [PATCH 01/23] adding reduced tables for tracks, particles, collisions, mccollisions --- PWGJE/DataModel/SlimTables.h | 124 +++++++++++++++++++++ PWGJE/TableProducer/CMakeLists.txt | 5 + PWGJE/TableProducer/SlimTablesProducer.cxx | 65 +++++++++++ 3 files changed, 194 insertions(+) create mode 100644 PWGJE/DataModel/SlimTables.h create mode 100644 PWGJE/TableProducer/SlimTablesProducer.cxx diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h new file mode 100644 index 00000000000..8e2923dc23e --- /dev/null +++ b/PWGJE/DataModel/SlimTables.h @@ -0,0 +1,124 @@ +// Copyright 2019-2025 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details. + +#ifndef PWGJE_DATAMODEL_SLIMTABLES_H_ +#define PWGJE_DATAMODEL_SLIMTABLES_H_ +#include "Common/DataModel/TrackSelectionTables.h" +#include "PWGJE/Core/JetDerivedDataUtilities.h" + + +#include +#include + +#include + +#include + + +namespace o2::aod +{ + +namespace slimcollision +{ +DECLARE_SOA_INDEX_COLUMN(Collision, collision); +DECLARE_SOA_COLUMN(PosZ, posZ, float); +DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float); +DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); +DECLARE_SOA_COLUMN(Weight, weight, float); +DECLARE_SOA_COLUMN(EventSel, eventSel, uint16_t); +DECLARE_SOA_COLUMN(TrackOccupancyInTimeRange, trackOccupancyInTimeRange, int); +} + +DECLARE_SOA_TABLE(SlimCollisions, "AOD", "SlimCollisions", + o2::soa::Index<>, + slimcollision::PosZ, + slimcollision::CentFT0C, + slimcollision::CentFT0M, + slimcollision::Weight, + slimcollision::EventSel, + slimcollision::TrackOccupancyInTimeRange); + +namespace slimmccollision +{ +DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); +DECLARE_SOA_COLUMN(PosZ, posZ, float); +DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); +DECLARE_SOA_COLUMN(Weight, weight, float); +DECLARE_SOA_COLUMN(Accepted, accepted, uint64_t); +DECLARE_SOA_COLUMN(PtHard, ptHard, float); +} + +DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", + o2::soa::Index<>, + slimmccollision::PosZ, + slimmccollision::CentFT0M, + slimmccollision::Weight, + slimmccollision::Accepted, + slimmccollision::PtHard); + + +namespace slimtracks +{ +DECLARE_SOA_INDEX_COLUMN(Collision, collisionId); +DECLARE_SOA_INDEX_COLUMN(Track, track); +DECLARE_SOA_COLUMN(Pt, pt, float); +DECLARE_SOA_COLUMN(Eta, eta, float); +DECLARE_SOA_COLUMN(Phi, phi, float); +DECLARE_SOA_COLUMN(DCAXY, dcaXY, float); +DECLARE_SOA_DYNAMIC_COLUMN(Px, px, + [](float pt, float phi) -> float { return pt * std::cos(phi); }); +DECLARE_SOA_DYNAMIC_COLUMN(Py, py, + [](float pt, float phi) -> float { return pt * std::sin(phi); }); +DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, + [](float pt, float eta) -> float { return pt * std::sinh(eta); }); +DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, + [](float pt, float eta) -> float { return std::sqrt((pt * std::cosh(eta) * pt * std::cosh(eta)) + (jetderiveddatautilities::mPion * jetderiveddatautilities::mPion)); }); + + +} +DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", + o2::soa::Index<>, + slimtracks::CollisionId, + slimtracks::Pt, + slimtracks::Eta, + slimtracks::Phi, + slimtracks::DCAXY, + slimtracks::Px, + slimtracks::Py, + slimtracks::Pz, + slimtracks::Energy); + + +namespace slimparticles +{ +DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); +DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); +DECLARE_SOA_COLUMN(Pt, pt, float); +DECLARE_SOA_COLUMN(Eta, eta, float); +DECLARE_SOA_COLUMN(Phi, phi, float); + +DECLARE_SOA_DYNAMIC_COLUMN(Px, px, + [](float pt, float phi) -> float { return pt * std::cos(phi); }); +DECLARE_SOA_DYNAMIC_COLUMN(Py, py, + [](float pt, float phi) -> float { return pt * std::sin(phi); }); +DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, + [](float pt, float eta) -> float { return pt * std::sinh(eta); }); +DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, + [](float e) -> float { return e; }); +} + +DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", + o2::soa::Index<>, + slimparticles::McCollisionId, + slimparticles::Pt, + slimparticles::Eta, + slimparticles::Phi, + slimparticles::Px, + slimparticles::Py, + slimparticles::Pz, + slimparticles::Energy + ); + +} // namespace o2::aod + +#endif // PWGJE_DATAMODEL_SLIMTABLES_H_ diff --git a/PWGJE/TableProducer/CMakeLists.txt b/PWGJE/TableProducer/CMakeLists.txt index 60689f07e65..3ef1b47e246 100644 --- a/PWGJE/TableProducer/CMakeLists.txt +++ b/PWGJE/TableProducer/CMakeLists.txt @@ -105,3 +105,8 @@ o2physics_add_dpl_workflow(emcal-cluster-hadronic-correction-task SOURCES emcalClusterHadronicCorrectionTask.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2::EMCALBase O2::EMCALReconstruction COMPONENT_NAME Analysis) + +o2physics_add_dpl_workflow(slim-tables-producer + SOURCES SlimTablesProducer.cxx + PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore + COMPONENT_NAME Analysis) \ No newline at end of file diff --git a/PWGJE/TableProducer/SlimTablesProducer.cxx b/PWGJE/TableProducer/SlimTablesProducer.cxx new file mode 100644 index 00000000000..0d8466c057c --- /dev/null +++ b/PWGJE/TableProducer/SlimTablesProducer.cxx @@ -0,0 +1,65 @@ +#include "PWGJE/DataModel/SlimTables.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "Framework/AnalysisHelpers.h" +#include +#include +#include +#include + +using namespace o2; +using namespace o2::framework; +using namespace o2::framework::expressions; + +struct SlimTablesProducer { + + void init(InitContext&) + { + } + + Produces slimCollisions; + Produces slimMcCollisions; + Produces slimTracks; + Produces slimParticles; + + void processCollision(aod::SlimCollisions const& collisions) + { + for (auto& coll : collisions) { + slimCollisions(coll.posZ(), coll.centFT0C(), coll.centFT0M(), coll.weight(), coll.eventSel(), coll.trackOccupancyInTimeRange()); + } + } + PROCESS_SWITCH(SlimTablesProducer, processCollision,"Produce slim collision table", true); + + void processMcCollision(aod::SlimMcCollisions const& mccollisions) + { + for (auto& mccoll : mccollisions) { + slimMcCollisions(mccoll.posZ(), mccoll.centFT0M(), mccoll.weight(), mccoll.accepted(), mccoll.ptHard()); + } + } + PROCESS_SWITCH(SlimTablesProducer, processMcCollision,"Produce slim mc collision table", true); + + + void processTracks(aod::SlimTracks const& tracks) + { + for (auto& trk : tracks) { + slimTracks(trk.collisionId(), trk.pt() , trk.eta(), trk.phi(), trk.dcaXY()); + } + } + PROCESS_SWITCH(SlimTablesProducer, processTracks,"Produce slim track table", true); + + void processParticles(aod::McParticles const& parts) + { + for (auto& p : parts) { + slimParticles(p.mcCollisionId(), p.pt(), p.eta(), p.phi()); + } + } + PROCESS_SWITCH(SlimTablesProducer, processParticles, "produce slim particles", true); + +}; + +WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) +{ + return WorkflowSpec{ + adaptAnalysisTask(cfgc, TaskName{"slim-tables-producer"}) + }; +} From d703aa73aac7689fbaeb6dfdddfe4a9d83b1edfa Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 14:52:53 +0100 Subject: [PATCH 02/23] correct copyright notice --- PWGJE/DataModel/SlimTables.h | 23 +++++++++++++++++----- PWGJE/TableProducer/CMakeLists.txt | 4 ++-- PWGJE/TableProducer/SlimTablesProducer.cxx | 16 +++++++++++++++ 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 8e2923dc23e..cd30e9e747a 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -1,12 +1,25 @@ -// Copyright 2019-2025 CERN and copyright holders of ALICE O2. -// See https://alice-o2.web.cern.ch/copyright for details. +// 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 SlimTables.h +/// \author Millot Louise +/// \since 2024-11-27 +/// \brief Header for the SlimTables task for the analysis of the reduced tables. +/// #ifndef PWGJE_DATAMODEL_SLIMTABLES_H_ #define PWGJE_DATAMODEL_SLIMTABLES_H_ -#include "Common/DataModel/TrackSelectionTables.h" -#include "PWGJE/Core/JetDerivedDataUtilities.h" - +#include "PWGJE/Core/JetDerivedDataUtilities.h" #include #include diff --git a/PWGJE/TableProducer/CMakeLists.txt b/PWGJE/TableProducer/CMakeLists.txt index 3ef1b47e246..837c1aba5ca 100644 --- a/PWGJE/TableProducer/CMakeLists.txt +++ b/PWGJE/TableProducer/CMakeLists.txt @@ -105,8 +105,8 @@ o2physics_add_dpl_workflow(emcal-cluster-hadronic-correction-task SOURCES emcalClusterHadronicCorrectionTask.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2::EMCALBase O2::EMCALReconstruction COMPONENT_NAME Analysis) - + o2physics_add_dpl_workflow(slim-tables-producer SOURCES SlimTablesProducer.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore - COMPONENT_NAME Analysis) \ No newline at end of file + COMPONENT_NAME Analysis) \ No newline at end of file diff --git a/PWGJE/TableProducer/SlimTablesProducer.cxx b/PWGJE/TableProducer/SlimTablesProducer.cxx index 0d8466c057c..c4f0f5dd2b9 100644 --- a/PWGJE/TableProducer/SlimTablesProducer.cxx +++ b/PWGJE/TableProducer/SlimTablesProducer.cxx @@ -1,3 +1,19 @@ +// 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 SlimTablesProducer.cxx +/// \brief Task to produce a reduced version of Tables for tracks, collisions, mcparticles and mccollisions. +/// \author Millot Louise + + #include "PWGJE/DataModel/SlimTables.h" #include "Framework/AnalysisDataModel.h" #include "Framework/AnalysisTask.h" From 00bb3d9b3ee2671d95c8c57a7d476c8a5aa970e8 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:01:00 +0100 Subject: [PATCH 03/23] check O2 linter issues --- PWGJE/TableProducer/SlimTablesProducer.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PWGJE/TableProducer/SlimTablesProducer.cxx b/PWGJE/TableProducer/SlimTablesProducer.cxx index c4f0f5dd2b9..67f5f40c5b1 100644 --- a/PWGJE/TableProducer/SlimTablesProducer.cxx +++ b/PWGJE/TableProducer/SlimTablesProducer.cxx @@ -40,7 +40,7 @@ struct SlimTablesProducer { void processCollision(aod::SlimCollisions const& collisions) { - for (auto& coll : collisions) { + for (const auto& coll : collisions) { slimCollisions(coll.posZ(), coll.centFT0C(), coll.centFT0M(), coll.weight(), coll.eventSel(), coll.trackOccupancyInTimeRange()); } } @@ -48,7 +48,7 @@ struct SlimTablesProducer { void processMcCollision(aod::SlimMcCollisions const& mccollisions) { - for (auto& mccoll : mccollisions) { + for (const auto& mccoll : mccollisions) { slimMcCollisions(mccoll.posZ(), mccoll.centFT0M(), mccoll.weight(), mccoll.accepted(), mccoll.ptHard()); } } @@ -57,7 +57,7 @@ struct SlimTablesProducer { void processTracks(aod::SlimTracks const& tracks) { - for (auto& trk : tracks) { + for (const auto& trk : tracks) { slimTracks(trk.collisionId(), trk.pt() , trk.eta(), trk.phi(), trk.dcaXY()); } } @@ -65,7 +65,7 @@ struct SlimTablesProducer { void processParticles(aod::McParticles const& parts) { - for (auto& p : parts) { + for (const auto& p : parts) { slimParticles(p.mcCollisionId(), p.pt(), p.eta(), p.phi()); } } @@ -76,6 +76,6 @@ struct SlimTablesProducer { WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc, TaskName{"slim-tables-producer"}) + adaptAnalysisTask(cfgc) }; } From 3e5f9dd438d5b8eb41002301769ecffbbfe4a2e8 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:07:52 +0100 Subject: [PATCH 04/23] Rename SlimTablesProducer.cxx to slimTablesProducer.cxx --- .../{SlimTablesProducer.cxx => slimTablesProducer.cxx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename PWGJE/TableProducer/{SlimTablesProducer.cxx => slimTablesProducer.cxx} (100%) diff --git a/PWGJE/TableProducer/SlimTablesProducer.cxx b/PWGJE/TableProducer/slimTablesProducer.cxx similarity index 100% rename from PWGJE/TableProducer/SlimTablesProducer.cxx rename to PWGJE/TableProducer/slimTablesProducer.cxx From 55d7f025270adc3aea645a2de30a331b297bf00d Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:17:05 +0100 Subject: [PATCH 05/23] formatting clamg-format, spaces --- PWGJE/TableProducer/slimTablesProducer.cxx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/PWGJE/TableProducer/slimTablesProducer.cxx b/PWGJE/TableProducer/slimTablesProducer.cxx index 67f5f40c5b1..20af0bac7fa 100644 --- a/PWGJE/TableProducer/slimTablesProducer.cxx +++ b/PWGJE/TableProducer/slimTablesProducer.cxx @@ -16,8 +16,8 @@ #include "PWGJE/DataModel/SlimTables.h" #include "Framework/AnalysisDataModel.h" -#include "Framework/AnalysisTask.h" #include "Framework/AnalysisHelpers.h" +#include "Framework/AnalysisTask.h" #include #include #include @@ -44,7 +44,7 @@ struct SlimTablesProducer { slimCollisions(coll.posZ(), coll.centFT0C(), coll.centFT0M(), coll.weight(), coll.eventSel(), coll.trackOccupancyInTimeRange()); } } - PROCESS_SWITCH(SlimTablesProducer, processCollision,"Produce slim collision table", true); + PROCESS_SWITCH(SlimTablesProducer, processCollision, "Produce slim collision table", true); void processMcCollision(aod::SlimMcCollisions const& mccollisions) { @@ -52,16 +52,16 @@ struct SlimTablesProducer { slimMcCollisions(mccoll.posZ(), mccoll.centFT0M(), mccoll.weight(), mccoll.accepted(), mccoll.ptHard()); } } - PROCESS_SWITCH(SlimTablesProducer, processMcCollision,"Produce slim mc collision table", true); + PROCESS_SWITCH(SlimTablesProducer, processMcCollision, "Produce slim mc collision table", true); void processTracks(aod::SlimTracks const& tracks) { for (const auto& trk : tracks) { - slimTracks(trk.collisionId(), trk.pt() , trk.eta(), trk.phi(), trk.dcaXY()); + slimTracks(trk.collisionId(), trk.pt(), trk.eta(), trk.phi(), trk.dcaXY()); } } - PROCESS_SWITCH(SlimTablesProducer, processTracks,"Produce slim track table", true); + PROCESS_SWITCH(SlimTablesProducer, processTracks, "Produce slim track table", true); void processParticles(aod::McParticles const& parts) { @@ -69,13 +69,11 @@ struct SlimTablesProducer { slimParticles(p.mcCollisionId(), p.pt(), p.eta(), p.phi()); } } - PROCESS_SWITCH(SlimTablesProducer, processParticles, "produce slim particles", true); - + PROCESS_SWITCH(SlimTablesProducer, processParticles, "Produce slim particles", true); }; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc) - }; + adaptAnalysisTask(cfgc)}; } From 44b6cf9d2b535b83dbab74a94637bc2f4ad2dea9 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:23:46 +0100 Subject: [PATCH 06/23] checking spaces, indentation --- PWGJE/DataModel/SlimTables.h | 53 +++++++++++----------- PWGJE/TableProducer/slimTablesProducer.cxx | 3 +- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index cd30e9e747a..805a6b1fff7 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -40,16 +40,16 @@ DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); DECLARE_SOA_COLUMN(Weight, weight, float); DECLARE_SOA_COLUMN(EventSel, eventSel, uint16_t); DECLARE_SOA_COLUMN(TrackOccupancyInTimeRange, trackOccupancyInTimeRange, int); -} +}// namespace slimcollision DECLARE_SOA_TABLE(SlimCollisions, "AOD", "SlimCollisions", - o2::soa::Index<>, - slimcollision::PosZ, - slimcollision::CentFT0C, - slimcollision::CentFT0M, - slimcollision::Weight, - slimcollision::EventSel, - slimcollision::TrackOccupancyInTimeRange); + o2::soa::Index<>, + slimcollision::PosZ, + slimcollision::CentFT0C, + slimcollision::CentFT0M, + slimcollision::Weight, + slimcollision::EventSel, + slimcollision::TrackOccupancyInTimeRange); namespace slimmccollision { @@ -59,15 +59,15 @@ DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); DECLARE_SOA_COLUMN(Weight, weight, float); DECLARE_SOA_COLUMN(Accepted, accepted, uint64_t); DECLARE_SOA_COLUMN(PtHard, ptHard, float); -} +}// namespace slimmccollision DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", - o2::soa::Index<>, - slimmccollision::PosZ, - slimmccollision::CentFT0M, - slimmccollision::Weight, - slimmccollision::Accepted, - slimmccollision::PtHard); + o2::soa::Index<>, + slimmccollision::PosZ, + slimmccollision::CentFT0M, + slimmccollision::Weight, + slimmccollision::Accepted, + slimmccollision::PtHard); namespace slimtracks @@ -88,7 +88,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, [](float pt, float eta) -> float { return std::sqrt((pt * std::cosh(eta) * pt * std::cosh(eta)) + (jetderiveddatautilities::mPion * jetderiveddatautilities::mPion)); }); -} +}// namespace slimtracks DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", o2::soa::Index<>, slimtracks::CollisionId, @@ -118,19 +118,18 @@ DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) -> float { return pt * std::sinh(eta); }); DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, [](float e) -> float { return e; }); -} +}// namespace slimparticles DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", - o2::soa::Index<>, - slimparticles::McCollisionId, - slimparticles::Pt, - slimparticles::Eta, - slimparticles::Phi, - slimparticles::Px, - slimparticles::Py, - slimparticles::Pz, - slimparticles::Energy - ); + o2::soa::Index<>, + slimparticles::McCollisionId, + slimparticles::Pt, + slimparticles::Eta, + slimparticles::Phi, + slimparticles::Px, + slimparticles::Py, + slimparticles::Pz, + slimparticles::Energy); } // namespace o2::aod diff --git a/PWGJE/TableProducer/slimTablesProducer.cxx b/PWGJE/TableProducer/slimTablesProducer.cxx index 20af0bac7fa..b8c85bfdc62 100644 --- a/PWGJE/TableProducer/slimTablesProducer.cxx +++ b/PWGJE/TableProducer/slimTablesProducer.cxx @@ -13,8 +13,8 @@ /// \brief Task to produce a reduced version of Tables for tracks, collisions, mcparticles and mccollisions. /// \author Millot Louise - #include "PWGJE/DataModel/SlimTables.h" + #include "Framework/AnalysisDataModel.h" #include "Framework/AnalysisHelpers.h" #include "Framework/AnalysisTask.h" @@ -54,7 +54,6 @@ struct SlimTablesProducer { } PROCESS_SWITCH(SlimTablesProducer, processMcCollision, "Produce slim mc collision table", true); - void processTracks(aod::SlimTracks const& tracks) { for (const auto& trk : tracks) { From 35bbba016c5fbb0eda2222155947e70634c5267b Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:27:11 +0100 Subject: [PATCH 07/23] Apply clang-format corrections --- PWGJE/DataModel/SlimTables.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 805a6b1fff7..02e8480b798 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -40,7 +40,7 @@ DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); DECLARE_SOA_COLUMN(Weight, weight, float); DECLARE_SOA_COLUMN(EventSel, eventSel, uint16_t); DECLARE_SOA_COLUMN(TrackOccupancyInTimeRange, trackOccupancyInTimeRange, int); -}// namespace slimcollision +} // namespace slimcollision DECLARE_SOA_TABLE(SlimCollisions, "AOD", "SlimCollisions", o2::soa::Index<>, @@ -59,7 +59,7 @@ DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); DECLARE_SOA_COLUMN(Weight, weight, float); DECLARE_SOA_COLUMN(Accepted, accepted, uint64_t); DECLARE_SOA_COLUMN(PtHard, ptHard, float); -}// namespace slimmccollision +} // namespace slimmccollision DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", o2::soa::Index<>, @@ -69,7 +69,6 @@ DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", slimmccollision::Accepted, slimmccollision::PtHard); - namespace slimtracks { DECLARE_SOA_INDEX_COLUMN(Collision, collisionId); @@ -86,9 +85,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) -> float { return pt * std::sinh(eta); }); DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, [](float pt, float eta) -> float { return std::sqrt((pt * std::cosh(eta) * pt * std::cosh(eta)) + (jetderiveddatautilities::mPion * jetderiveddatautilities::mPion)); }); - - -}// namespace slimtracks +} // namespace slimtracks DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", o2::soa::Index<>, slimtracks::CollisionId, @@ -101,7 +98,6 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", slimtracks::Pz, slimtracks::Energy); - namespace slimparticles { DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); @@ -118,7 +114,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) -> float { return pt * std::sinh(eta); }); DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, [](float e) -> float { return e; }); -}// namespace slimparticles +} // namespace slimparticles DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", o2::soa::Index<>, From 475cef783151f4910abe7556d414c6f577f8e077 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:31:03 +0100 Subject: [PATCH 08/23] Fix formatting: remove empty line before include --- PWGJE/DataModel/SlimTables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 02e8480b798..77830c2a0e0 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -20,6 +20,7 @@ #define PWGJE_DATAMODEL_SLIMTABLES_H_ #include "PWGJE/Core/JetDerivedDataUtilities.h" + #include #include @@ -27,7 +28,6 @@ #include - namespace o2::aod { From a5d6058df1a66fa02fd71dd66d86cad5ae79835f Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:33:01 +0100 Subject: [PATCH 09/23] fixing name in CMakeLists.txt --- PWGJE/TableProducer/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGJE/TableProducer/CMakeLists.txt b/PWGJE/TableProducer/CMakeLists.txt index 837c1aba5ca..da355ebb430 100644 --- a/PWGJE/TableProducer/CMakeLists.txt +++ b/PWGJE/TableProducer/CMakeLists.txt @@ -107,6 +107,6 @@ o2physics_add_dpl_workflow(emcal-cluster-hadronic-correction-task COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(slim-tables-producer - SOURCES SlimTablesProducer.cxx + SOURCES slimTablesProducer.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore COMPONENT_NAME Analysis) \ No newline at end of file From 00c63535f16d6b1a9b37ebcbd3ecd93f22779b75 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:36:24 +0100 Subject: [PATCH 10/23] adding workflow name --- PWGJE/TableProducer/slimTablesProducer.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGJE/TableProducer/slimTablesProducer.cxx b/PWGJE/TableProducer/slimTablesProducer.cxx index b8c85bfdc62..1c6e47737b2 100644 --- a/PWGJE/TableProducer/slimTablesProducer.cxx +++ b/PWGJE/TableProducer/slimTablesProducer.cxx @@ -74,5 +74,5 @@ struct SlimTablesProducer { WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc)}; + adaptAnalysisTask(cfgc, TaskName{"slim-tables-producer"})}; } From 777f2712a953c4b94658d2138f3078c251327c9f Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:46:55 +0100 Subject: [PATCH 11/23] correcting workflow name --- PWGJE/TableProducer/slimTablesProducer.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGJE/TableProducer/slimTablesProducer.cxx b/PWGJE/TableProducer/slimTablesProducer.cxx index 1c6e47737b2..a6af53eeca0 100644 --- a/PWGJE/TableProducer/slimTablesProducer.cxx +++ b/PWGJE/TableProducer/slimTablesProducer.cxx @@ -74,5 +74,5 @@ struct SlimTablesProducer { WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc, TaskName{"slim-tables-producer"})}; + adaptAnalysisTask(cfgc, TaskName{"slim-tables-producer"})}; // o2-linter: disable=name/o2-task } From 997fa48fc5c40d5d7c998d4a94ca2089580d0c23 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 15:53:09 +0100 Subject: [PATCH 12/23] adding clang + workflow name --- PWGJE/TableProducer/slimTablesProducer.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGJE/TableProducer/slimTablesProducer.cxx b/PWGJE/TableProducer/slimTablesProducer.cxx index a6af53eeca0..72dedcd13ad 100644 --- a/PWGJE/TableProducer/slimTablesProducer.cxx +++ b/PWGJE/TableProducer/slimTablesProducer.cxx @@ -9,7 +9,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file SlimTablesProducer.cxx +/// \file slimTablesProducer.cxx /// \brief Task to produce a reduced version of Tables for tracks, collisions, mcparticles and mccollisions. /// \author Millot Louise @@ -74,5 +74,5 @@ struct SlimTablesProducer { WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc, TaskName{"slim-tables-producer"})}; // o2-linter: disable=name/o2-task + adaptAnalysisTask(cfgc)}; } From 3eb18fc1c5da72159b9ab2423508e9a21e9e5267 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 16:13:47 +0100 Subject: [PATCH 13/23] changing Maj Min columns names --- PWGJE/DataModel/SlimTables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 77830c2a0e0..f3373bb063a 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -76,7 +76,7 @@ DECLARE_SOA_INDEX_COLUMN(Track, track); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); DECLARE_SOA_COLUMN(Phi, phi, float); -DECLARE_SOA_COLUMN(DCAXY, dcaXY, float); +DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) -> float { return pt * std::cos(phi); }); DECLARE_SOA_DYNAMIC_COLUMN(Py, py, @@ -92,7 +92,7 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", slimtracks::Pt, slimtracks::Eta, slimtracks::Phi, - slimtracks::DCAXY, + slimtracks::DcaXY, slimtracks::Px, slimtracks::Py, slimtracks::Pz, From 73747314d1164a1a2606c3bd54b739c32c0afaf6 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 16:22:20 +0100 Subject: [PATCH 14/23] adding a o2 linter disable column --- PWGJE/DataModel/SlimTables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index f3373bb063a..1a705ea3165 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -71,7 +71,7 @@ DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", namespace slimtracks { -DECLARE_SOA_INDEX_COLUMN(Collision, collisionId); +DECLARE_SOA_INDEX_COLUMN(Collision, collisionId); // o2-linter: disable=name/o2-column DECLARE_SOA_INDEX_COLUMN(Track, track); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -100,7 +100,7 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { -DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); +DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); // o2-linter: disable=name/o2-column DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); From 3151ec5aa0425f0b7146b675aacf17875c15ce80 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 16:26:46 +0100 Subject: [PATCH 15/23] rename columns --- PWGJE/DataModel/SlimTables.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 1a705ea3165..42950a02ea4 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -71,7 +71,7 @@ DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", namespace slimtracks { -DECLARE_SOA_INDEX_COLUMN(Collision, collisionId); // o2-linter: disable=name/o2-column +DECLARE_SOA_INDEX_COLUMN(Collision, collision); DECLARE_SOA_INDEX_COLUMN(Track, track); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -88,7 +88,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, } // namespace slimtracks DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", o2::soa::Index<>, - slimtracks::CollisionId, + slimtracks::Collision, slimtracks::Pt, slimtracks::Eta, slimtracks::Phi, @@ -100,7 +100,7 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { -DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); // o2-linter: disable=name/o2-column +DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -118,7 +118,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", o2::soa::Index<>, - slimparticles::McCollisionId, + slimparticles::McCollision, slimparticles::Pt, slimparticles::Eta, slimparticles::Phi, From cbeca0a47d4f8ac7e7afa28116d1f5aecdfac169 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 16:31:08 +0100 Subject: [PATCH 16/23] change in name columns --- PWGJE/DataModel/SlimTables.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 42950a02ea4..1a705ea3165 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -71,7 +71,7 @@ DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", namespace slimtracks { -DECLARE_SOA_INDEX_COLUMN(Collision, collision); +DECLARE_SOA_INDEX_COLUMN(Collision, collisionId); // o2-linter: disable=name/o2-column DECLARE_SOA_INDEX_COLUMN(Track, track); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -88,7 +88,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, } // namespace slimtracks DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", o2::soa::Index<>, - slimtracks::Collision, + slimtracks::CollisionId, slimtracks::Pt, slimtracks::Eta, slimtracks::Phi, @@ -100,7 +100,7 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { -DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); +DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); // o2-linter: disable=name/o2-column DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -118,7 +118,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", o2::soa::Index<>, - slimparticles::McCollision, + slimparticles::McCollisionId, slimparticles::Pt, slimparticles::Eta, slimparticles::Phi, From 787b106950859ac90d2df77c6e8495b0518abf53 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 16:33:45 +0100 Subject: [PATCH 17/23] change in name columns by adding linter disable --- PWGJE/DataModel/SlimTables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 1a705ea3165..6266c3efd61 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -88,7 +88,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, } // namespace slimtracks DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", o2::soa::Index<>, - slimtracks::CollisionId, + slimtracks::CollisionId, // o2-linter: disable=name/o2-column slimtracks::Pt, slimtracks::Eta, slimtracks::Phi, @@ -118,7 +118,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", o2::soa::Index<>, - slimparticles::McCollisionId, + slimparticles::McCollisionId, // o2-linter: disable=name/o2-column slimparticles::Pt, slimparticles::Eta, slimparticles::Phi, From 38633808f61aab6cc6b1fd75aadce948d38df999 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 16:44:13 +0100 Subject: [PATCH 18/23] change in column index --- PWGJE/DataModel/SlimTables.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 6266c3efd61..1cdeea74a1d 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -71,7 +71,7 @@ DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", namespace slimtracks { -DECLARE_SOA_INDEX_COLUMN(Collision, collisionId); // o2-linter: disable=name/o2-column +DECLARE_SOA_INDEX_COLUMN(SlimCollision, collision); DECLARE_SOA_INDEX_COLUMN(Track, track); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -88,7 +88,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, } // namespace slimtracks DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", o2::soa::Index<>, - slimtracks::CollisionId, // o2-linter: disable=name/o2-column + slimtracks::SlimCollisionId, slimtracks::Pt, slimtracks::Eta, slimtracks::Phi, @@ -100,7 +100,7 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { -DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollisionId); // o2-linter: disable=name/o2-column +DECLARE_SOA_INDEX_COLUMN(SlimMcCollision, mcCollision); DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -118,7 +118,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", o2::soa::Index<>, - slimparticles::McCollisionId, // o2-linter: disable=name/o2-column + slimparticles::SlimMcCollisionId, slimparticles::Pt, slimparticles::Eta, slimparticles::Phi, From 26ec9b9cbe3e30d78169edcdbf7ba13b6a208c8e Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 16:53:09 +0100 Subject: [PATCH 19/23] linter disable --- PWGJE/DataModel/SlimTables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 1cdeea74a1d..2ad9f12ed5a 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -71,7 +71,7 @@ DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", namespace slimtracks { -DECLARE_SOA_INDEX_COLUMN(SlimCollision, collision); +DECLARE_SOA_INDEX_COLUMN(SlimCollision, collision); // o2-linter: disable=name/o2-column DECLARE_SOA_INDEX_COLUMN(Track, track); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -100,7 +100,7 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { -DECLARE_SOA_INDEX_COLUMN(SlimMcCollision, mcCollision); +DECLARE_SOA_INDEX_COLUMN(SlimMcCollision, mcCollision); // o2-linter: disable=name/o2-column DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); From 608e0ffc5455c28df189de2f40f947113a69aa55 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 16:58:26 +0100 Subject: [PATCH 20/23] resolve linter issues --- PWGJE/DataModel/SlimTables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 2ad9f12ed5a..1cdeea74a1d 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -71,7 +71,7 @@ DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", namespace slimtracks { -DECLARE_SOA_INDEX_COLUMN(SlimCollision, collision); // o2-linter: disable=name/o2-column +DECLARE_SOA_INDEX_COLUMN(SlimCollision, collision); DECLARE_SOA_INDEX_COLUMN(Track, track); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -100,7 +100,7 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { -DECLARE_SOA_INDEX_COLUMN(SlimMcCollision, mcCollision); // o2-linter: disable=name/o2-column +DECLARE_SOA_INDEX_COLUMN(SlimMcCollision, mcCollision); DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); From a9a3c496a6b6935d1902d9a0f44440cb8308f844 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 17:46:03 +0100 Subject: [PATCH 21/23] changes --- PWGJE/DataModel/SlimTables.h | 6 ++---- PWGJE/TableProducer/slimTablesProducer.cxx | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 1cdeea74a1d..469742d4c50 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -71,7 +71,7 @@ DECLARE_SOA_TABLE(SlimMcCollisions, "AOD", "SlimMcCollisions", namespace slimtracks { -DECLARE_SOA_INDEX_COLUMN(SlimCollision, collision); +DECLARE_SOA_INDEX_COLUMN(Collision, collision); DECLARE_SOA_INDEX_COLUMN(Track, track); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -88,7 +88,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, } // namespace slimtracks DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", o2::soa::Index<>, - slimtracks::SlimCollisionId, + slimtracks::Collision, slimtracks::Pt, slimtracks::Eta, slimtracks::Phi, @@ -100,7 +100,6 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { -DECLARE_SOA_INDEX_COLUMN(SlimMcCollision, mcCollision); DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); @@ -118,7 +117,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", o2::soa::Index<>, - slimparticles::SlimMcCollisionId, slimparticles::Pt, slimparticles::Eta, slimparticles::Phi, diff --git a/PWGJE/TableProducer/slimTablesProducer.cxx b/PWGJE/TableProducer/slimTablesProducer.cxx index 72dedcd13ad..cdeba93d1a0 100644 --- a/PWGJE/TableProducer/slimTablesProducer.cxx +++ b/PWGJE/TableProducer/slimTablesProducer.cxx @@ -57,7 +57,7 @@ struct SlimTablesProducer { void processTracks(aod::SlimTracks const& tracks) { for (const auto& trk : tracks) { - slimTracks(trk.collisionId(), trk.pt(), trk.eta(), trk.phi(), trk.dcaXY()); + slimTracks(trk.collision(), trk.pt(), trk.eta(), trk.phi(), trk.dcaXY()); } } PROCESS_SWITCH(SlimTablesProducer, processTracks, "Produce slim track table", true); @@ -65,7 +65,7 @@ struct SlimTablesProducer { void processParticles(aod::McParticles const& parts) { for (const auto& p : parts) { - slimParticles(p.mcCollisionId(), p.pt(), p.eta(), p.phi()); + slimParticles(p.pt(), p.eta(), p.phi()); } } PROCESS_SWITCH(SlimTablesProducer, processParticles, "Produce slim particles", true); From 4d24c819fd54337241387513f0364c60850dce44 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 18:06:49 +0100 Subject: [PATCH 22/23] changes to rename properly the files --- PWGJE/DataModel/SlimTables.h | 5 +++-- PWGJE/TableProducer/slimTablesProducer.cxx | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 469742d4c50..51a7adb22b9 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -88,7 +88,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, } // namespace slimtracks DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", o2::soa::Index<>, - slimtracks::Collision, + slimtracks::CollisionId, slimtracks::Pt, slimtracks::Eta, slimtracks::Phi, @@ -100,11 +100,11 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { +DECLARE_SOA_INDEX_COLUMN(McCollision, mccollision); DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float); DECLARE_SOA_COLUMN(Phi, phi, float); - DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) -> float { return pt * std::cos(phi); }); DECLARE_SOA_DYNAMIC_COLUMN(Py, py, @@ -117,6 +117,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Energy, energy, DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles", o2::soa::Index<>, + slimparticles::McCollisionId, slimparticles::Pt, slimparticles::Eta, slimparticles::Phi, diff --git a/PWGJE/TableProducer/slimTablesProducer.cxx b/PWGJE/TableProducer/slimTablesProducer.cxx index cdeba93d1a0..895fb3b9dfe 100644 --- a/PWGJE/TableProducer/slimTablesProducer.cxx +++ b/PWGJE/TableProducer/slimTablesProducer.cxx @@ -65,7 +65,7 @@ struct SlimTablesProducer { void processParticles(aod::McParticles const& parts) { for (const auto& p : parts) { - slimParticles(p.pt(), p.eta(), p.phi()); + slimParticles(p.mcCollision(), p.pt(), p.eta(), p.phi()); } } PROCESS_SWITCH(SlimTablesProducer, processParticles, "Produce slim particles", true); From 818dd6d304d9c023d01d58023a0b0c696bd911e9 Mon Sep 17 00:00:00 2001 From: louisemillot Date: Thu, 27 Nov 2025 18:08:28 +0100 Subject: [PATCH 23/23] rename a columns --- PWGJE/DataModel/SlimTables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGJE/DataModel/SlimTables.h b/PWGJE/DataModel/SlimTables.h index 51a7adb22b9..ecbacf68382 100644 --- a/PWGJE/DataModel/SlimTables.h +++ b/PWGJE/DataModel/SlimTables.h @@ -100,7 +100,7 @@ DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks", namespace slimparticles { -DECLARE_SOA_INDEX_COLUMN(McCollision, mccollision); +DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle); DECLARE_SOA_COLUMN(Pt, pt, float); DECLARE_SOA_COLUMN(Eta, eta, float);