[CPP20][GEOMETRY] Remove deprecated enum arithmetic

cms-sw · Mar 22, 2024 · 2a3d9c1 · 2a3d9c1
1 parent eaea9c0
commit 2a3d9c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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;