Changes from review

cms-sw · Jun 4, 2024 · f7a44d1 · f7a44d1
1 parent 5b1e1c8
commit f7a44d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/Geometry/CaloGeometry/interface/CaloGeometry.h b/Geometry/CaloGeometry/interface/CaloGeometry.h
@@ -56,14 +56,8 @@ class CaloGeometry {
 
   unsigned int makeIndex(DetId::Detector det, int subdet, bool& ok) const;
 
-  enum {
-    kMaxDet = 10,
-    kMinDet = 3,
-    kNDets = kMaxDet - kMinDet + 1,
-    kMaxSub = 6,
-    kNSubDets = kMaxSub + 1,
-    kLength = kNDets * kNSubDets
-  };
+  static constexpr int kMaxDet = 10, kMinDet = 3, kNDets = kMaxDet - kMinDet + 1, kMaxSub = 6, kNSubDets = kMaxSub + 1,
+                       kLength = kNDets * kNSubDets;
 };
 
 #endif
diff --git a/Geometry/CaloGeometry/src/CaloGeometry.cc b/Geometry/CaloGeometry/src/CaloGeometry.cc
@@ -16,7 +16,7 @@ unsigned int CaloGeometry::makeIndex(DetId::Detector det, int subdet, bool& ok)
     edm::LogWarning("CaloGeometry") << "Det:Subdet " << idet << ":" << subdet << " min|max Det " << kMinDet << ":"
                                     << kMaxDet << " min|max subdet 0:" << kMaxSub;
 
-  return ((det - static_cast<int>(kMinDet)) * kNSubDets + subdet);
+  return ((det - kMinDet) * kNSubDets + subdet);
 }
 
 void CaloGeometry::setSubdetGeometry(DetId::Detector det, int subdet, const CaloSubdetectorGeometry* geom) {