From 8d0cd0e506c2d618898dfc4a26c12e3f1d38a158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 17:10:09 +0200 Subject: [PATCH 01/10] Update CollisionTypeHelper.cxx --- Common/Core/CollisionTypeHelper.cxx | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Common/Core/CollisionTypeHelper.cxx b/Common/Core/CollisionTypeHelper.cxx index 2396a217215..ad82b4f4808 100644 --- a/Common/Core/CollisionTypeHelper.cxx +++ b/Common/Core/CollisionTypeHelper.cxx @@ -34,7 +34,16 @@ std::string o2::common::core::CollisionSystemType::getCollisionSystemName(collTy return "XeXe"; case kCollSyspPb: return "pPb"; + case kCollSysOO: + return "OO"; + case kCollSyspO: + return "pO"; + case kCollSysNeNe: + return "NeNe"; + case kCollSysUndef: + return "Undefined"; default: + LOG(warning) << "Undefined collision system type: " << collSys; return "Undefined"; } } @@ -43,7 +52,10 @@ int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameter { const int ZBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA); const int ZBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC); - LOG(debug) << "Collision system: " << ZBeamA << " * " << ZBeamC << " detected"; + const int ABeamA = grplhcif->getBeamA(o2::constants::lhc::BeamDirection::BeamA); + const int ABeamC = grplhcif->getBeamA(o2::constants::lhc::BeamDirection::BeamC); + LOG(debug) << "Collision system Z: " << ZBeamA << " * " << ZBeamC << " detected = " << ZBeamA * ZBeamC; + LOG(debug) << "Collision system A: " << ABeamA << " * " << ABeamC << " detected = " << ABeamA * ABeamC; switch (ZBeamA * ZBeamC) { case 1: // pp 1*1 return kCollSyspp; @@ -53,8 +65,14 @@ int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameter return kCollSysXeXe; case 82: // p-Pb 82*1 return kCollSyspPb; + case 64: // O-O 8*8 + return kCollSysOO; + case 8: // p-O 8*1 + return kCollSyspO; + case 100: // Ne-Ne 10*10 + return kCollSysNeNe; default: - LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with BeamA = " << ZBeamA << " and BeamC = " << ZBeamC; + LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with Z of BeamA = " << ZBeamA << " and Z of BeamC = " << ZBeamC << "; A of BeamA = " << ABeamA << " and A of BeamC = " << ABeamC; return kCollSysUndef; } return kCollSysUndef; From a716d3764ba5b5eb42c9add79781cb73b66cc29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 17:10:46 +0200 Subject: [PATCH 02/10] Update CollisionTypeHelper.h --- Common/Core/CollisionTypeHelper.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Common/Core/CollisionTypeHelper.h b/Common/Core/CollisionTypeHelper.h index 523d3d049c4..2be68cb07ad 100644 --- a/Common/Core/CollisionTypeHelper.h +++ b/Common/Core/CollisionTypeHelper.h @@ -34,7 +34,10 @@ struct CollisionSystemType { static constexpr collType kCollSysPbPb = 1; // PbPb static constexpr collType kCollSysXeXe = 2; // XeXe static constexpr collType kCollSyspPb = 3; // pPb - static constexpr collType kNCollSys = 4; // Number of collision systems + static constexpr collType kCollSysOO = 4; // OO (Oxygen-Oxygen) + static constexpr collType kCollSyspO = 5; // pO (proton-Oxygen) + static constexpr collType kCollSysNeNe = 6; // NeNe (Neon-Neon) + static constexpr collType kNCollSys = 7; // Number of collision systems static std::string getCollisionSystemName(collType collSys); From 9471c55cf3efac195622499043ec37c6e9bae7f3 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Wed, 2 Jul 2025 17:11:30 +0200 Subject: [PATCH 03/10] Please consider the following formatting changes to #11879 (#11880) --- Common/Core/CollisionTypeHelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Core/CollisionTypeHelper.h b/Common/Core/CollisionTypeHelper.h index 2be68cb07ad..c8dc7a21842 100644 --- a/Common/Core/CollisionTypeHelper.h +++ b/Common/Core/CollisionTypeHelper.h @@ -36,7 +36,7 @@ struct CollisionSystemType { static constexpr collType kCollSyspPb = 3; // pPb static constexpr collType kCollSysOO = 4; // OO (Oxygen-Oxygen) static constexpr collType kCollSyspO = 5; // pO (proton-Oxygen) - static constexpr collType kCollSysNeNe = 6; // NeNe (Neon-Neon) + static constexpr collType kCollSysNeNe = 6; // NeNe (Neon-Neon) static constexpr collType kNCollSys = 7; // Number of collision systems static std::string getCollisionSystemName(collType collSys); From 7d53bf66e28dd4e52371e79515bec6a819dd5216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 17:12:41 +0200 Subject: [PATCH 04/10] Create testCollisionTypeHelper.C --- Common/Core/macros/testCollisionTypeHelper.C | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Common/Core/macros/testCollisionTypeHelper.C diff --git a/Common/Core/macros/testCollisionTypeHelper.C b/Common/Core/macros/testCollisionTypeHelper.C new file mode 100644 index 00000000000..c247cc83497 --- /dev/null +++ b/Common/Core/macros/testCollisionTypeHelper.C @@ -0,0 +1,27 @@ +// 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. + +#include "Common/Core/CollisionTypeHelper.h" + +#include "CCDB/BasicCCDBManager.h" +#include "DataFormatsParameters/GRPLHCIFData.h" + +void testCollisionTypeHelper(int runNumber = 564275) +{ + + o2::common::core::CollisionSystemType collSysType; + auto& ccdb = o2::ccdb::BasicCCDBManager::instance(); + ccdb.setURL("http://alice-ccdb.cern.ch"); + o2::parameters::GRPLHCIFData* grpo = ccdb.getSpecificForRun("GLO/Config/GRPLHCIF", + runNumber); + grpo->print(); + int collsys = CollisionSystemType::getCollisionTypeFromGrp(grpo); +} From 24aa6e9a7a6f3ac27dc9819fc49eb5f72c98c133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 17:18:03 +0200 Subject: [PATCH 05/10] Update testCollisionTypeHelper.C --- Common/Core/macros/testCollisionTypeHelper.C | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Common/Core/macros/testCollisionTypeHelper.C b/Common/Core/macros/testCollisionTypeHelper.C index c247cc83497..e67d3cd947c 100644 --- a/Common/Core/macros/testCollisionTypeHelper.C +++ b/Common/Core/macros/testCollisionTypeHelper.C @@ -9,6 +9,10 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +/// \file testCollisionTypeHelper.C +/// \author Nicolò Jacazio nicolo.jacazio@cern.ch +/// \brief Test the CollisionTypeHelper functionality + #include "Common/Core/CollisionTypeHelper.h" #include "CCDB/BasicCCDBManager.h" From bab3265939f77754fdcc20191c61d01526976d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 17:28:31 +0200 Subject: [PATCH 06/10] Update CollisionTypeHelper.cxx --- Common/Core/CollisionTypeHelper.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Common/Core/CollisionTypeHelper.cxx b/Common/Core/CollisionTypeHelper.cxx index ad82b4f4808..3fac00c9b70 100644 --- a/Common/Core/CollisionTypeHelper.cxx +++ b/Common/Core/CollisionTypeHelper.cxx @@ -50,13 +50,10 @@ std::string o2::common::core::CollisionSystemType::getCollisionSystemName(collTy int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif) { - const int ZBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA); - const int ZBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC); - const int ABeamA = grplhcif->getBeamA(o2::constants::lhc::BeamDirection::BeamA); - const int ABeamC = grplhcif->getBeamA(o2::constants::lhc::BeamDirection::BeamC); - LOG(debug) << "Collision system Z: " << ZBeamA << " * " << ZBeamC << " detected = " << ZBeamA * ZBeamC; - LOG(debug) << "Collision system A: " << ABeamA << " * " << ABeamC << " detected = " << ABeamA * ABeamC; - switch (ZBeamA * ZBeamC) { + const int zBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA); + const int zBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC); + LOG(debug) << "Collision system Z: " << zBeamA << " * " << zBeamC << " detected = " << zBeamA * zBeamC; + switch (zBeamA * zBeamC) { case 1: // pp 1*1 return kCollSyspp; case 6724: // Pb-Pb 82*82 @@ -72,7 +69,7 @@ int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameter case 100: // Ne-Ne 10*10 return kCollSysNeNe; default: - LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with Z of BeamA = " << ZBeamA << " and Z of BeamC = " << ZBeamC << "; A of BeamA = " << ABeamA << " and A of BeamC = " << ABeamC; + LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with Z of BeamA = " << zBeamA << " and Z of BeamC = " << zBeamC; return kCollSysUndef; } return kCollSysUndef; From fc4ede4c3e44f9c7fff6d2c4beb36076b98e1c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 17:29:38 +0200 Subject: [PATCH 07/10] Update testCollisionTypeHelper.C --- Common/Core/macros/testCollisionTypeHelper.C | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Common/Core/macros/testCollisionTypeHelper.C b/Common/Core/macros/testCollisionTypeHelper.C index e67d3cd947c..43624ea697e 100644 --- a/Common/Core/macros/testCollisionTypeHelper.C +++ b/Common/Core/macros/testCollisionTypeHelper.C @@ -18,14 +18,13 @@ #include "CCDB/BasicCCDBManager.h" #include "DataFormatsParameters/GRPLHCIFData.h" -void testCollisionTypeHelper(int runNumber = 564275) +void testCollisionTypeHelper(int runNumber = 544124) { - o2::common::core::CollisionSystemType collSysType; auto& ccdb = o2::ccdb::BasicCCDBManager::instance(); ccdb.setURL("http://alice-ccdb.cern.ch"); o2::parameters::GRPLHCIFData* grpo = ccdb.getSpecificForRun("GLO/Config/GRPLHCIF", runNumber); grpo->print(); - int collsys = CollisionSystemType::getCollisionTypeFromGrp(grpo); + int collsys = o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(grpo); } From b874a012fde9f5f3902f124f4e677f54efb69170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 23:16:09 +0200 Subject: [PATCH 08/10] Update CollisionTypeHelper.cxx --- Common/Core/CollisionTypeHelper.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Common/Core/CollisionTypeHelper.cxx b/Common/Core/CollisionTypeHelper.cxx index 3fac00c9b70..47ce4a77f11 100644 --- a/Common/Core/CollisionTypeHelper.cxx +++ b/Common/Core/CollisionTypeHelper.cxx @@ -9,7 +9,6 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// /// \file CollisionTypeHelper.h /// \author Nicolò Jacazio nicolo.jacazio@cern.ch /// \brief Utility to handle the collision type from the GRP information From 5b3bc5fde53c2b4678f1915545a3c60d4c9caa2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 23:17:28 +0200 Subject: [PATCH 09/10] Update CollisionTypeHelper.cxx --- Common/Core/CollisionTypeHelper.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Common/Core/CollisionTypeHelper.cxx b/Common/Core/CollisionTypeHelper.cxx index 47ce4a77f11..f82ee4e61d1 100644 --- a/Common/Core/CollisionTypeHelper.cxx +++ b/Common/Core/CollisionTypeHelper.cxx @@ -12,7 +12,6 @@ /// \file CollisionTypeHelper.h /// \author Nicolò Jacazio nicolo.jacazio@cern.ch /// \brief Utility to handle the collision type from the GRP information -/// #include "Common/Core/CollisionTypeHelper.h" From 51d6d3787a3d3444dccc21a275e6bbc90d025d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 2 Jul 2025 23:18:33 +0200 Subject: [PATCH 10/10] Update CollisionTypeHelper.cxx --- Common/Core/CollisionTypeHelper.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Common/Core/CollisionTypeHelper.cxx b/Common/Core/CollisionTypeHelper.cxx index f82ee4e61d1..4d7e1de3f87 100644 --- a/Common/Core/CollisionTypeHelper.cxx +++ b/Common/Core/CollisionTypeHelper.cxx @@ -9,9 +9,11 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file CollisionTypeHelper.h +/// +/// \file CollisionTypeHelper.cxx /// \author Nicolò Jacazio nicolo.jacazio@cern.ch /// \brief Utility to handle the collision type from the GRP information +/// #include "Common/Core/CollisionTypeHelper.h"