Use cornersize variable

cms-sw · Nov 1, 2018 · 58e146c · 58e146c
1 parent d34f346
commit 58e146c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
@@ -697,7 +697,7 @@ std::pair<float,float> HGCalDDDConstants::locateCellTrap(int lay, int irad,
 
 bool HGCalDDDConstants::maskCell(const DetId& detId, int corners) const {
   bool mask(false);
-  if (corners > 2 && corners < 6) {
+  if (corners > 2 && corners < (int)(HGCalParameters::k_CornerSize)) {
     if ((mode_ == HGCalGeometryMode::Hexagon8) ||
         (mode_ == HGCalGeometryMode::Hexagon8Full)) {
       int N(0), layer(0), waferU(0), waferV(0), u(0), v(0);

diff --git a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
@@ -914,7 +914,7 @@ void HGCalGeomParameters::loadWaferHexagon(HGCalParameters& php) {
             }
             if ((!cornerAll) && (nCorner > 0)) {
               if ((nCorner > 1) && (firstCorner == 0) && (firstMiss < nCorner)) {
-                firstCorner = firstMiss+6-nCorner;
+                firstCorner = firstMiss+HGCalParameters::k_CornerSize-nCorner;
               }
               int wl = HGCalWaferIndex::waferIndex(php.layer_[il],copy,0,true);
               waferTypes[wl] = std::make_pair(nCorner,firstCorner);
@@ -1026,7 +1026,7 @@ void HGCalGeomParameters::loadWaferHexagon8(HGCalParameters& php) {
         ++lpos;
 #ifdef EDM_ML_DEBUG
         indtypes.emplace_back(kndx);
-        int  corners[6];
+        int  corners[HGCalParameters::k_CornerSize];
 #endif
         bool cornerOne(false), cornerAll(true);
         int  nCorner(0), firstCorner(-1), firstMiss(-1);
@@ -1052,7 +1052,7 @@ void HGCalGeomParameters::loadWaferHexagon8(HGCalParameters& php) {
                                         << php.rMaxLayHex_[i] << " u "
                                         << u << " v " << v << " with "
                                         << nCorner << " corners";
-          for (int k=0; k<6; ++k) {
+          for (uint32_t k=0; k<HGCalParameters::k_CornerSize; ++k) {
             double rpos = std::sqrt(xc[k]*xc[k]+yc[k]*yc[k]);
             edm::LogVerbatim("HGCalGeom") << "[" << k << "] x " << xc[k] 
                                           << " y " << yc[k] << " R " << rpos;
@@ -1064,7 +1064,7 @@ void HGCalGeomParameters::loadWaferHexagon8(HGCalParameters& php) {
         }
         if ((!cornerAll) && (nCorner > 0)) {
           if ((nCorner > 1) && (firstCorner == 0) && (firstMiss < nCorner)) {
-            firstCorner = firstMiss+6-nCorner;
+            firstCorner = firstMiss+HGCalParameters::k_CornerSize-nCorner;
           }
 #ifdef EDM_ML_DEBUG
           edm::LogVerbatim("HGCalGeom") << "Layer " << lay << " u|v " << u