Merge pull request #32081 from bsunanda/Run4-hgx267

Run4-hgx267 Fix masking mechanism for partial wafer definition in HGCal
cms-sw · Nov 11, 2020 · 820b4c9 · 820b4c9
2 parents 7c9d085 + aee45f3
commit 820b4c9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Geometry/HGCalCommonData/src/HGCalWaferMask.cc b/Geometry/HGCalCommonData/src/HGCalWaferMask.cc
@@ -297,7 +297,8 @@ bool HGCalWaferMask::goodCell(int u, int v, int n, int type, int rotn) {
     case (HGCalTypes::WaferSemi2): {  //WaferSemi2
       switch (rotn) {
         case (HGCalTypes::WaferCorner0): {
-          good = ((u + v) < (3 * n2));
+          int n3 = (n + 1) / 3;
+          good = ((u + v) < (4 * n3));
           break;
         }
         case (HGCalTypes::WaferCorner1): {
@@ -310,15 +311,15 @@ bool HGCalWaferMask::goodCell(int u, int v, int n, int type, int rotn) {
           break;
         }
         case (HGCalTypes::WaferCorner3): {
-          good = ((u + v) > (5 * n2 - 1));
+          good = ((u + v) >= (5 * n2));
           break;
         }
         case (HGCalTypes::WaferCorner4): {
           good = ((2 * u - v) > (3 * n2));
           break;
         }
         default: {
-          int u2 = ((u + 1) / 2);
+          int u2 = ((n == 8) ? ((u + 1) / 2) : (u / 2));
           good = ((v - u2) < n4);
           break;
         }