From 995949e179e9fe93b3bce767ff275e87e38643b0 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Wed, 4 Feb 2026 14:59:57 -0600 Subject: [PATCH 1/3] fix order of types to be consistent with previous --- Geometry/HGCalCommonData/src/HGCalTypes.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/HGCalCommonData/src/HGCalTypes.cc b/Geometry/HGCalCommonData/src/HGCalTypes.cc index d19036f9b7a69..8529116c839f6 100644 --- a/Geometry/HGCalCommonData/src/HGCalTypes.cc +++ b/Geometry/HGCalCommonData/src/HGCalTypes.cc @@ -42,9 +42,9 @@ int32_t HGCalTypes::getUnpackedCell6(int id) { return (id % faccell6_); } int32_t HGCalTypes::layerType(int type) { static const int32_t layerTypeX[7] = {HGCalTypes::WaferCenter, HGCalTypes::WaferCenterB, - HGCalTypes::WaferCenterR, HGCalTypes::CornerCenterYp, HGCalTypes::CornerCenterYm, + HGCalTypes::WaferCenterR, HGCalTypes::CornerCenterXp, HGCalTypes::CornerCenterXm}; return ((type >= 0) && (type < 7)) ? layerTypeX[type] : HGCalTypes::WaferCenter; From 70803e9cc5d107be8ba932ac7a1bc82bc13122df Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Wed, 4 Feb 2026 15:03:48 -0600 Subject: [PATCH 2/3] revert numerical values to previous --- Geometry/HGCalCommonData/interface/HGCalTypes.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Geometry/HGCalCommonData/interface/HGCalTypes.h b/Geometry/HGCalCommonData/interface/HGCalTypes.h index a6ec2d9148347..a86135155c2cd 100644 --- a/Geometry/HGCalCommonData/interface/HGCalTypes.h +++ b/Geometry/HGCalCommonData/interface/HGCalTypes.h @@ -20,12 +20,12 @@ class HGCalTypes { static constexpr int32_t UnknownPosition = -1; static constexpr int32_t WaferCenter = 0; - static constexpr int32_t WaferCenterB = 1; - static constexpr int32_t CornerCenterYp = 2; - static constexpr int32_t CornerCenterYm = 3; - static constexpr int32_t WaferCenterR = 4; - static constexpr int32_t CornerCenterXp = 5; - static constexpr int32_t CornerCenterXm = 6; + static constexpr int32_t CornerCenterYp = 1; + static constexpr int32_t CornerCenterYm = 2; + static constexpr int32_t CornerCenterXp = 3; + static constexpr int32_t CornerCenterXm = 4; + static constexpr int32_t WaferCenterB = 5; + static constexpr int32_t WaferCenterR = 6; static constexpr int32_t WaferTypeUndefined = -1; static constexpr int32_t WaferHD120 = 0; From 24fc6c4f7fe8c2656a99db3dbbe8046363fb8cdd Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Wed, 4 Feb 2026 22:31:43 -0600 Subject: [PATCH 3/3] Revert "fix order of types to be consistent with previous" This reverts commit 995949e179e9fe93b3bce767ff275e87e38643b0. --- Geometry/HGCalCommonData/src/HGCalTypes.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/HGCalCommonData/src/HGCalTypes.cc b/Geometry/HGCalCommonData/src/HGCalTypes.cc index 8529116c839f6..d19036f9b7a69 100644 --- a/Geometry/HGCalCommonData/src/HGCalTypes.cc +++ b/Geometry/HGCalCommonData/src/HGCalTypes.cc @@ -42,9 +42,9 @@ int32_t HGCalTypes::getUnpackedCell6(int id) { return (id % faccell6_); } int32_t HGCalTypes::layerType(int type) { static const int32_t layerTypeX[7] = {HGCalTypes::WaferCenter, HGCalTypes::WaferCenterB, + HGCalTypes::WaferCenterR, HGCalTypes::CornerCenterYp, HGCalTypes::CornerCenterYm, - HGCalTypes::WaferCenterR, HGCalTypes::CornerCenterXp, HGCalTypes::CornerCenterXm}; return ((type >= 0) && (type < 7)) ? layerTypeX[type] : HGCalTypes::WaferCenter;