Merge pull request #41208 from bsunanda/Phase2-hgx336E

Phase2-hgx336E Try to fix an error in the code for HGCal V16 Geometry and take care of the #define statement in Geometry/HGCalCommonData/src
cms-sw · Mar 30, 2023 · d6b11db · d6b11db
2 parents e215d99 + 6dc951e
commit d6b11db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc b/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc
@@ -8,7 +8,7 @@
 #include "Geometry/HGCalCommonData/interface/HGCalGeometryMode.h"
 #include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
 
-#define EDM_ML_DEBUG
+//#define EDM_ML_DEBUG
 using namespace geant_units::operators;
 
 bool HGCalParametersFromDD::build(const DDCompactView* cpv,

diff --git a/Geometry/HGCalCommonData/src/HGCalWaferMask.cc b/Geometry/HGCalCommonData/src/HGCalWaferMask.cc
@@ -1344,8 +1344,8 @@ std::vector<std::pair<double, double> > HGCalWaferMask::waferXY(
     }
   } else if (part == HGCalTypes::WaferHalf2) {
     int np[6][5] = {{45, 39, 4, 5, 45},
-                    {47, 40, 5, 0, 47},
-                    {48, 41, 0, 1, 48},
+                    {46, 40, 5, 0, 46},
+                    {47, 41, 0, 1, 47},
                     {42, 36, 1, 2, 42},
                     {43, 37, 2, 3, 43},
                     {44, 38, 3, 4, 44}};