From eaea9c01050253427535fc40dc9ca3622be2f431 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Fri, 22 Mar 2024 11:49:22 +0100 Subject: [PATCH 1/2] [CPP20][GEOMETRY] Remove deprecated enum arithmetic --- DataFormats/EcalDetId/interface/EBDetId.h | 2 +- DataFormats/EcalDetId/interface/EEDetId.h | 10 ++++------ DataFormats/EcalDetId/interface/ESDetId.h | 2 +- .../HcalDetId/interface/HcalCastorDetId.h | 4 ++-- .../HcalDetId/interface/HcalZDCDetId.h | 2 +- .../CaloTopology/interface/HcalTopology.h | 20 +++++++++---------- .../EcalAlgo/interface/EcalBarrelGeometry.h | 6 +++--- .../EcalAlgo/interface/EcalEndcapGeometry.h | 6 +++--- .../interface/EcalPreshowerGeometry.h | 6 +++--- .../interface/CastorGeometry.h | 6 +++--- .../ForwardGeometry/interface/ZdcGeometry.h | 6 +++--- 11 files changed, 34 insertions(+), 36 deletions(-) diff --git a/DataFormats/EcalDetId/interface/EBDetId.h b/DataFormats/EcalDetId/interface/EBDetId.h index 926798e3569c3..62ad79dc2a7fb 100644 --- a/DataFormats/EcalDetId/interface/EBDetId.h +++ b/DataFormats/EcalDetId/interface/EBDetId.h @@ -152,7 +152,7 @@ class EBDetId : public DetId { // eta coverage of one crystal (approximate) static const float crystalUnitToEta; - enum { kSizeForDenseIndexing = MAX_HASH + 1 }; + static constexpr int kSizeForDenseIndexing = MAX_HASH + 1; // function modes for (int, int) constructor static const int ETAPHIMODE = 0; diff --git a/DataFormats/EcalDetId/interface/EEDetId.h b/DataFormats/EcalDetId/interface/EEDetId.h index a4a2b4e60d49c..4ac8e577b4565 100644 --- a/DataFormats/EcalDetId/interface/EEDetId.h +++ b/DataFormats/EcalDetId/interface/EEDetId.h @@ -319,15 +319,13 @@ class EEDetId : public DetId { */ static const int ICR_MAX = 25; - enum { - /** Number of crystals per Dee - */ - kEEhalf = 7324, + /** Number of crystals per Dee + */ + static constexpr int kEEhalf = 7324; /** Number of dense crystal indices, that is number of * crystals per endcap. */ - kSizeForDenseIndexing = 2 * kEEhalf - }; + static constexpr int kSizeForDenseIndexing = 2 * kEEhalf ; /*@{*/ /** function modes for EEDetId(int, int, int, int) constructor diff --git a/DataFormats/EcalDetId/interface/ESDetId.h b/DataFormats/EcalDetId/interface/ESDetId.h index cecac59bf4e2d..ddd37681b1e25 100644 --- a/DataFormats/EcalDetId/interface/ESDetId.h +++ b/DataFormats/EcalDetId/interface/ESDetId.h @@ -99,7 +99,7 @@ class ESDetId : public DetId { static const unsigned short hy2[kXYMAX]; public: - enum { kSizeForDenseIndexing = kLa }; + static constexpr int kSizeForDenseIndexing = kLa; }; std::ostream& operator<<(std::ostream&, const ESDetId& id); diff --git a/DataFormats/HcalDetId/interface/HcalCastorDetId.h b/DataFormats/HcalDetId/interface/HcalCastorDetId.h index 302241999e84f..ce339b693584a 100644 --- a/DataFormats/HcalDetId/interface/HcalCastorDetId.h +++ b/DataFormats/HcalDetId/interface/HcalCastorDetId.h @@ -64,12 +64,12 @@ class HcalCastorDetId : public DetId { // get the individual cell id // int channel() const; - enum { + static constexpr int kNumberModulesPerEnd = 14, kNumberSectorsPerEnd = 16, kNumberCellsPerEnd = kNumberModulesPerEnd * kNumberSectorsPerEnd, kSizeForDenseIndexing = kNumberCellsPerEnd - }; + ; uint32_t denseIndex() const; diff --git a/DataFormats/HcalDetId/interface/HcalZDCDetId.h b/DataFormats/HcalDetId/interface/HcalZDCDetId.h index 290e38e6ffbf6..c1124664c5f63 100644 --- a/DataFormats/HcalDetId/interface/HcalZDCDetId.h +++ b/DataFormats/HcalDetId/interface/HcalZDCDetId.h @@ -200,7 +200,7 @@ class HcalZDCDetId : public DetId { public: constexpr static int32_t kSizeForDenseIndexingRun1 = 2 * kDepRun1; constexpr static int32_t kSizeForDenseIndexingRun3 = 2 * kDepRun3; - enum { kSizeForDenseIndexing = kSizeForDenseIndexingRun1 }; + constexpr static int32_t kSizeForDenseIndexing = kSizeForDenseIndexingRun1; }; std::ostream& operator<<(std::ostream&, const HcalZDCDetId& id); diff --git a/Geometry/CaloTopology/interface/HcalTopology.h b/Geometry/CaloTopology/interface/HcalTopology.h index c7df15c3889fa..810114e25a8a2 100644 --- a/Geometry/CaloTopology/interface/HcalTopology.h +++ b/Geometry/CaloTopology/interface/HcalTopology.h @@ -224,7 +224,7 @@ class HcalTopology : public CaloSubdetectorTopology { SegmentationMap depthSegmentation_; SegmentationMap depthSegmentationOne_; - enum { + static constexpr int kHBhalf = 1296, kHEhalf = 1296, kHOhalf = 1080, @@ -235,15 +235,15 @@ class HcalTopology : public CaloSubdetectorTopology { kCALIBhalf = 693, kHThalfPhase1 = 2520, kHcalhalf = kHBhalf + kHEhalf + kHOhalf + kHFhalf - }; - enum { kSizeForDenseIndexingPreLS1 = 2 * kHcalhalf }; - enum { kHBSizePreLS1 = 2 * kHBhalf }; - enum { kHESizePreLS1 = 2 * kHEhalf }; - enum { kHOSizePreLS1 = 2 * kHOhalf }; - enum { kHFSizePreLS1 = 2 * kHFhalf }; - enum { kHTSizePreLS1 = 2 * kHThalf }; - enum { kHTSizePhase1 = 2 * kHThalfPhase1 }; - enum { kCALIBSizePreLS1 = 2 * kCALIBhalf }; + ; + static constexpr int kSizeForDenseIndexingPreLS1 = 2 * kHcalhalf; + static constexpr int kHBSizePreLS1 = 2 * kHBhalf; + static constexpr int kHESizePreLS1 = 2 * kHEhalf; + static constexpr int kHOSizePreLS1 = 2 * kHOhalf; + static constexpr int kHFSizePreLS1 = 2 * kHFhalf; + static constexpr int kHTSizePreLS1 = 2 * kHThalf; + static constexpr int kHTSizePhase1 = 2 * kHThalfPhase1; + static constexpr int kCALIBSizePreLS1 = 2 * kCALIBhalf; static constexpr int minMaxDepth_ = 4; static constexpr unsigned int minPhi_ = 1, maxPhi_ = 72; static constexpr unsigned int kOffCalibHB_ = 0; diff --git a/Geometry/EcalAlgo/interface/EcalBarrelGeometry.h b/Geometry/EcalAlgo/interface/EcalBarrelGeometry.h index f515f9cd07b25..a9be4ba3fd00a 100644 --- a/Geometry/EcalAlgo/interface/EcalBarrelGeometry.h +++ b/Geometry/EcalAlgo/interface/EcalBarrelGeometry.h @@ -37,11 +37,11 @@ class EcalBarrelGeometry final : public CaloSubdetectorGeometry { typedef EBDetId DetIdType; - enum { k_NumberOfCellsForCorners = EBDetId::kSizeForDenseIndexing }; + static constexpr int k_NumberOfCellsForCorners = EBDetId::kSizeForDenseIndexing; - enum { k_NumberOfShapes = 17 }; + static constexpr int k_NumberOfShapes = 17; - enum { k_NumberOfParametersPerShape = 11 }; + static constexpr int k_NumberOfParametersPerShape = 11; static std::string dbString() { return "PEcalBarrelRcd"; } diff --git a/Geometry/EcalAlgo/interface/EcalEndcapGeometry.h b/Geometry/EcalAlgo/interface/EcalEndcapGeometry.h index 41821a41a90e0..6ef97a3127ed2 100644 --- a/Geometry/EcalAlgo/interface/EcalEndcapGeometry.h +++ b/Geometry/EcalAlgo/interface/EcalEndcapGeometry.h @@ -38,11 +38,11 @@ class EcalEndcapGeometry final : public CaloSubdetectorGeometry { typedef EEDetId DetIdType; - enum { k_NumberOfCellsForCorners = EEDetId::kSizeForDenseIndexing }; + static constexpr int k_NumberOfCellsForCorners = EEDetId::kSizeForDenseIndexing; - enum { k_NumberOfShapes = 1 }; + static constexpr int k_NumberOfShapes = 1; - enum { k_NumberOfParametersPerShape = 11 }; + static constexpr int k_NumberOfParametersPerShape = 11; static std::string dbString() { return "PEcalEndcapRcd"; } diff --git a/Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h b/Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h index 5fbeaae3aaf98..836c830175ce2 100644 --- a/Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h +++ b/Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h @@ -30,11 +30,11 @@ class EcalPreshowerGeometry final : public CaloSubdetectorGeometry { typedef CaloSubdetectorGeometry::ParVecVec ParVecVec; typedef ESDetId DetIdType; - enum { k_NumberOfCellsForCorners = ESDetId::kSizeForDenseIndexing }; + static constexpr int k_NumberOfCellsForCorners = ESDetId::kSizeForDenseIndexing; - enum { k_NumberOfShapes = 4 }; + static constexpr int k_NumberOfShapes = 4; - enum { k_NumberOfParametersPerShape = 4 }; + static constexpr int k_NumberOfParametersPerShape = 4; static std::string dbString() { return "PEcalPreshowerRcd"; } diff --git a/Geometry/ForwardGeometry/interface/CastorGeometry.h b/Geometry/ForwardGeometry/interface/CastorGeometry.h index d06d197655a96..335c83e3d499c 100644 --- a/Geometry/ForwardGeometry/interface/CastorGeometry.h +++ b/Geometry/ForwardGeometry/interface/CastorGeometry.h @@ -25,11 +25,11 @@ class CastorGeometry : public CaloSubdetectorGeometry { typedef PCastorRcd PGeometryRecord; typedef HcalCastorDetId DetIdType; - enum { k_NumberOfCellsForCorners = HcalCastorDetId::kSizeForDenseIndexing }; + static constexpr int k_NumberOfCellsForCorners = HcalCastorDetId::kSizeForDenseIndexing; - enum { k_NumberOfShapes = 4 }; + static constexpr int k_NumberOfShapes = 4; - enum { k_NumberOfParametersPerShape = 6 }; + static constexpr int k_NumberOfParametersPerShape = 6; static std::string dbString() { return "PCastorRcd"; } diff --git a/Geometry/ForwardGeometry/interface/ZdcGeometry.h b/Geometry/ForwardGeometry/interface/ZdcGeometry.h index c96a473a6f577..eaab12a8ca8d7 100644 --- a/Geometry/ForwardGeometry/interface/ZdcGeometry.h +++ b/Geometry/ForwardGeometry/interface/ZdcGeometry.h @@ -23,11 +23,11 @@ class ZdcGeometry : public CaloSubdetectorGeometry { typedef PZdcRcd PGeometryRecord; typedef HcalZDCDetId DetIdType; - enum { k_NumberOfCellsForCorners = HcalZDCDetId::kSizeForDenseIndexing }; + static constexpr int k_NumberOfCellsForCorners = HcalZDCDetId::kSizeForDenseIndexing; - enum { k_NumberOfShapes = 3 }; + static constexpr int k_NumberOfShapes = 3; - enum { k_NumberOfParametersPerShape = 4 }; + static constexpr int k_NumberOfParametersPerShape = 4; static std::string dbString() { return "PZdcRcd"; } From 2a3d9c18c5e7f0ef1f9a0dd298b3dfc8089c5ff2 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Fri, 22 Mar 2024 11:49:22 +0100 Subject: [PATCH 2/2] [CPP20][GEOMETRY] Remove deprecated enum arithmetic --- DataFormats/EcalDetId/interface/EEDetId.h | 4 ++-- DataFormats/HcalDetId/interface/HcalCastorDetId.h | 9 +++------ Geometry/CaloTopology/interface/HcalTopology.h | 15 +++------------ 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/DataFormats/EcalDetId/interface/EEDetId.h b/DataFormats/EcalDetId/interface/EEDetId.h index 4ac8e577b4565..e56eb6c957f98 100644 --- a/DataFormats/EcalDetId/interface/EEDetId.h +++ b/DataFormats/EcalDetId/interface/EEDetId.h @@ -322,10 +322,10 @@ class EEDetId : public DetId { /** Number of crystals per Dee */ static constexpr int kEEhalf = 7324; - /** Number of dense crystal indices, that is number of + /** Number of dense crystal indices, that is number of * crystals per endcap. */ - static constexpr int kSizeForDenseIndexing = 2 * kEEhalf ; + static constexpr int kSizeForDenseIndexing = 2 * kEEhalf; /*@{*/ /** function modes for EEDetId(int, int, int, int) constructor diff --git a/DataFormats/HcalDetId/interface/HcalCastorDetId.h b/DataFormats/HcalDetId/interface/HcalCastorDetId.h index ce339b693584a..c027d1489e647 100644 --- a/DataFormats/HcalDetId/interface/HcalCastorDetId.h +++ b/DataFormats/HcalDetId/interface/HcalCastorDetId.h @@ -64,12 +64,9 @@ class HcalCastorDetId : public DetId { // get the individual cell id // int channel() const; - static constexpr int - kNumberModulesPerEnd = 14, - kNumberSectorsPerEnd = 16, - kNumberCellsPerEnd = kNumberModulesPerEnd * kNumberSectorsPerEnd, - kSizeForDenseIndexing = kNumberCellsPerEnd - ; + static constexpr int kNumberModulesPerEnd = 14, kNumberSectorsPerEnd = 16, + kNumberCellsPerEnd = kNumberModulesPerEnd * kNumberSectorsPerEnd, + kSizeForDenseIndexing = kNumberCellsPerEnd; uint32_t denseIndex() const; diff --git a/Geometry/CaloTopology/interface/HcalTopology.h b/Geometry/CaloTopology/interface/HcalTopology.h index 810114e25a8a2..6f339af2be9db 100644 --- a/Geometry/CaloTopology/interface/HcalTopology.h +++ b/Geometry/CaloTopology/interface/HcalTopology.h @@ -224,18 +224,9 @@ class HcalTopology : public CaloSubdetectorTopology { SegmentationMap depthSegmentation_; SegmentationMap depthSegmentationOne_; - static constexpr int - kHBhalf = 1296, - kHEhalf = 1296, - kHOhalf = 1080, - kHFhalf = 864, - kHThalf = 2088, - kZDChalf = 11, - kCASTORhalf = 224, - kCALIBhalf = 693, - kHThalfPhase1 = 2520, - kHcalhalf = kHBhalf + kHEhalf + kHOhalf + kHFhalf - ; + static constexpr int kHBhalf = 1296, kHEhalf = 1296, kHOhalf = 1080, kHFhalf = 864, kHThalf = 2088, kZDChalf = 11, + kCASTORhalf = 224, kCALIBhalf = 693, kHThalfPhase1 = 2520, + kHcalhalf = kHBhalf + kHEhalf + kHOhalf + kHFhalf; static constexpr int kSizeForDenseIndexingPreLS1 = 2 * kHcalhalf; static constexpr int kHBSizePreLS1 = 2 * kHBhalf; static constexpr int kHESizePreLS1 = 2 * kHEhalf;