From 3db0bae928657af91678b2427210cbea3adb3181 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Mon, 9 Sep 2024 13:33:21 +0200 Subject: [PATCH 1/2] Common: easier indexing to avoid HY warning --- Common/DataModel/Multiplicity.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index 03c4888440d..75de7e6817c 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -107,6 +107,7 @@ DECLARE_SOA_TABLE(PVMults, "AOD", "PVMULT", //! Multiplicity from the PV contrib mult::IsInelGt1); using BarrelMults = soa::Join; using Mults = soa::Join; +using FT0Mult = FT0Mults::iterator; using Mult = Mults::iterator; DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //! @@ -211,21 +212,21 @@ DECLARE_SOA_TABLE(MultBCs, "AOD", "MULTBC", //! multBC::MultBCColliding); using MultBC = MultBCs::iterator; -// crosslinks +// crosslinks namespace mult { -DECLARE_SOA_INDEX_COLUMN(MultBC, multBC); +DECLARE_SOA_INDEX_COLUMN(MultBC, multBC); } namespace multBC { -DECLARE_SOA_INDEX_COLUMN(Mult, mult); +DECLARE_SOA_INDEX_COLUMN(FT0Mult, ft0Mult); } // for QA purposes DECLARE_SOA_TABLE(Mults2BC, "AOD", "MULTS2BC", //! Relate mult -> BC o2::soa::Index<>, mult::MultBCId); DECLARE_SOA_TABLE(BC2Mults, "AOD", "BC2MULTS", //! Relate BC -> mult - o2::soa::Index<>, multBC::MultId); + o2::soa::Index<>, multBC::FT0MultId); } // namespace o2::aod From 380f6c9231774dd2a5ee90f6ae76d1a9c7983a08 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Mon, 9 Sep 2024 13:34:14 +0200 Subject: [PATCH 2/2] Please consider the following formatting changes (#7625) --- Common/DataModel/Multiplicity.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index 75de7e6817c..b294a2bc16b 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -212,10 +212,10 @@ DECLARE_SOA_TABLE(MultBCs, "AOD", "MULTBC", //! multBC::MultBCColliding); using MultBC = MultBCs::iterator; -// crosslinks +// crosslinks namespace mult { -DECLARE_SOA_INDEX_COLUMN(MultBC, multBC); +DECLARE_SOA_INDEX_COLUMN(MultBC, multBC); } namespace multBC {