From 3f4e4010e3b3c1a530d17d32c9b50d71ab3f68c1 Mon Sep 17 00:00:00 2001 From: MattOckleton Date: Mon, 13 Apr 2026 14:47:26 +0200 Subject: [PATCH 1/2] column name fixes jetCorrelationD0 --- PWGJE/Tasks/jetCorrelationD0.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PWGJE/Tasks/jetCorrelationD0.cxx b/PWGJE/Tasks/jetCorrelationD0.cxx index bba4f0273aa..15b3cf7322f 100644 --- a/PWGJE/Tasks/jetCorrelationD0.cxx +++ b/PWGJE/Tasks/jetCorrelationD0.cxx @@ -81,7 +81,7 @@ DECLARE_SOA_COLUMN(D0PhiD, d0PhiD, float); DECLARE_SOA_COLUMN(D0Reflection, d0Reflection, int); } // namespace d0Info -DECLARE_SOA_TABLE(D0DataTables, "AOD", "D0TABLE", +DECLARE_SOA_TABLE(D0Tables, "AOD", "D0TABLE", o2::soa::Index<>, collisionInfo::CollisionTableId, d0Info::D0PromptBDT, @@ -105,8 +105,8 @@ DECLARE_SOA_TABLE(D0McPTables, "AOD", "D0MCPTABLE", namespace jetInfo { // D0 tables -DECLARE_SOA_INDEX_COLUMN(D0DataTable, d0DataTable); -DECLARE_SOA_INDEX_COLUMN(D0McPTable, d0McPTable); +DECLARE_SOA_INDEX_COLUMN_CUSTOM(D0Table, d0Table, "D0TABLE"); +DECLARE_SOA_INDEX_COLUMN_CUSTOM(D0McPTable, d0McPTable, "D0MCPTABLE"); // Jet DECLARE_SOA_COLUMN(JetPt, jetPt, float); DECLARE_SOA_COLUMN(JetEta, jetEta, float); @@ -119,10 +119,10 @@ DECLARE_SOA_COLUMN(D0JetDeltaPhi, d0JetDeltaPhi, float); DECLARE_SOA_COLUMN(D0JetDeltaPhiP, d0JetDeltaPhiP, float); } // namespace jetInfo -DECLARE_SOA_TABLE_STAGED(JetDataTables, "JETTABLE", +DECLARE_SOA_TABLE_STAGED(JetTables, "JETTABLE", o2::soa::Index<>, collisionInfo::CollisionTableId, - jetInfo::D0DataTableId, + jetInfo::D0TableId, jetInfo::JetPt, jetInfo::JetEta, jetInfo::JetPhi, @@ -156,9 +156,9 @@ struct JetCorrelationD0 { Produces tableCollision; Produces tableMatchedCollision; Produces tableMcCollision; - Produces tableD0; + Produces tableD0; Produces tableD0McParticle; - Produces tableJet; + Produces tableJet; Produces tableJetMcParticle; Produces tableJetMatched; From 25f36179df8939a8d7dbf779907d3dc906aeb8ee Mon Sep 17 00:00:00 2001 From: MattOckleton Date: Mon, 13 Apr 2026 15:21:31 +0200 Subject: [PATCH 2/2] removing custom index columns --- PWGJE/Tasks/jetCorrelationD0.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGJE/Tasks/jetCorrelationD0.cxx b/PWGJE/Tasks/jetCorrelationD0.cxx index 15b3cf7322f..31b3bfcb944 100644 --- a/PWGJE/Tasks/jetCorrelationD0.cxx +++ b/PWGJE/Tasks/jetCorrelationD0.cxx @@ -105,8 +105,8 @@ DECLARE_SOA_TABLE(D0McPTables, "AOD", "D0MCPTABLE", namespace jetInfo { // D0 tables -DECLARE_SOA_INDEX_COLUMN_CUSTOM(D0Table, d0Table, "D0TABLE"); -DECLARE_SOA_INDEX_COLUMN_CUSTOM(D0McPTable, d0McPTable, "D0MCPTABLE"); +DECLARE_SOA_INDEX_COLUMN(D0Table, d0Table); +DECLARE_SOA_INDEX_COLUMN(D0McPTable, d0McPTable); // Jet DECLARE_SOA_COLUMN(JetPt, jetPt, float); DECLARE_SOA_COLUMN(JetEta, jetEta, float);