From 46f944ba7f4f4b6c9ef440e982f74fb7383817c2 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sun, 15 Jun 2025 07:56:49 +0200 Subject: [PATCH 1/3] [Common] Change index column identifier to avoid HY unbound indices complaint (actual index value was fine) --- Common/DataModel/Multiplicity.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index 864e2a9cd1c..341b54523e5 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -184,14 +184,9 @@ DECLARE_SOA_TABLE_VERSIONED(MultMCExtras_001, "AOD", "MULTMCEXTRA", 1, //! Table mult::IsInelGt1, o2::soa::Marker<1>); -DECLARE_SOA_TABLE(MultHepMCHIs, "AOD", "MULTHEPMCHI", //! complementary table for heavy-ion mc info (subset of HepMCHeavyIons) - o2::soa::Index<>, hepmcheavyion::McCollisionId, hepmcheavyion::NcollHard, hepmcheavyion::NpartProj, hepmcheavyion::NpartTarg, - hepmcheavyion::Ncoll, hepmcheavyion::ImpactParameter); - using MultMCExtras = MultMCExtras_001; using MultMCExtra = MultMCExtras::iterator; using MultsExtraMC = MultMCExtras; // for backwards compatibility with previous naming scheme -using MultHepMCHI = MultHepMCHIs::iterator; // crosslinks namespace mult @@ -202,6 +197,12 @@ DECLARE_SOA_INDEX_COLUMN(MultMCExtra, multMCExtra); DECLARE_SOA_TABLE(Mult2MCExtras, "AOD", "Mult2MCEXTRA", //! Relate reco mult entry to MC extras entry o2::soa::Index<>, mult::MultMCExtraId); +DECLARE_SOA_TABLE(MultHepMCHIs, "AOD", "MULTHEPMCHI", //! complementary table for heavy-ion mc info (subset of HepMCHeavyIons) + o2::soa::Index<>, hepmcheavyion::MultMCExtraId, hepmcheavyion::NcollHard, hepmcheavyion::NpartProj, hepmcheavyion::NpartTarg, + hepmcheavyion::Ncoll, hepmcheavyion::ImpactParameter); + +using MultHepMCHI = MultHepMCHIs::iterator; + namespace multZeq { DECLARE_SOA_COLUMN(MultZeqFV0A, multZeqFV0A, float); //! Multiplicity equalized for the vertex position with the FV0A detector From e70da85791a65a62fa1801b675fac1f2bd704c07 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sun, 15 Jun 2025 08:30:24 +0200 Subject: [PATCH 2/3] Update Multiplicity.h --- Common/DataModel/Multiplicity.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index 341b54523e5..7c1c6f98e01 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -198,7 +198,7 @@ DECLARE_SOA_TABLE(Mult2MCExtras, "AOD", "Mult2MCEXTRA", //! Relate reco mult ent o2::soa::Index<>, mult::MultMCExtraId); DECLARE_SOA_TABLE(MultHepMCHIs, "AOD", "MULTHEPMCHI", //! complementary table for heavy-ion mc info (subset of HepMCHeavyIons) - o2::soa::Index<>, hepmcheavyion::MultMCExtraId, hepmcheavyion::NcollHard, hepmcheavyion::NpartProj, hepmcheavyion::NpartTarg, + o2::soa::Index<>, mult::MultMCExtraId, hepmcheavyion::NcollHard, hepmcheavyion::NpartProj, hepmcheavyion::NpartTarg, hepmcheavyion::Ncoll, hepmcheavyion::ImpactParameter); using MultHepMCHI = MultHepMCHIs::iterator; From 7a73576dd789dfd9e8ff69169652527e09053b69 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sun, 15 Jun 2025 08:30:57 +0200 Subject: [PATCH 3/3] Update Multiplicity.h --- Common/DataModel/Multiplicity.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index 7c1c6f98e01..0ac2a0074c6 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -8,6 +8,11 @@ // 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 Multiplicity.h +/// \brief multiplicity tables +/// \author ALICE + #ifndef COMMON_DATAMODEL_MULTIPLICITY_H_ #define COMMON_DATAMODEL_MULTIPLICITY_H_