Merge pull request #33191 from snwebb/SW-RotationClass-BugFix

Fix logical error in HGCal module rotation class
cms-sw · Mar 27, 2021 · a9cd560 · a9cd560
2 parents dcb4798 + 3439381
commit a9cd560
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/Geometry/HGCalCommonData/src/HGCalGeomRotation.cc b/Geometry/HGCalCommonData/src/HGCalGeomRotation.cc
@@ -36,8 +36,7 @@ void HGCalGeomRotation::uvMappingFrom60DegreeSector0(WaferCentring waferCentring
   if (waferCentring != WaferCentring::WaferCentred) {
     edm::LogError("HGCalGeomRotation")
         << "HGCalGeomRotation: 60 degree sector defintion selected, but not WaferCentred centring. This is "
-           "incompatible, switching to WaferCentred centring";
-    waferCentring = WaferCentring::WaferCentred;
+           "incompatible, assuming WaferCentred centring";
   }
 
   if (sector > 5) {
@@ -125,8 +124,7 @@ unsigned HGCalGeomRotation::uvMappingTo60DegreeSector0(WaferCentring waferCentri
   if (waferCentring != WaferCentring::WaferCentred) {
     edm::LogError("HGCalGeomRotation")
         << "HGCalGeomRotation: 60 degree sector defintion selected, but not WaferCentred centring. This is "
-           "incompatible, switching to WaferCentred centring";
-    waferCentring = WaferCentring::WaferCentred;
+           "incompatible, assuming WaferCentred centring";
   }
 
   if (moduleU > 0 && moduleV >= 0) {
@@ -135,8 +133,7 @@ unsigned HGCalGeomRotation::uvMappingTo60DegreeSector0(WaferCentring waferCentri
     } else {
       sector = 1;
     }
-  }
-  if (moduleU >= moduleV && moduleV < 0) {
+  } else if (moduleU >= moduleV && moduleV < 0) {
     if (moduleU >= 0) {
       sector = 5;
     } else {