Backport the bugfix from cms-sw#41380 in Geometry/HGcalCommonData to …

…take care of the segmentation fault for 25234.911
Ming-Yan · Nov 29, 2023 · 728f07c · 728f07c
1 parent 4bcdd78
commit 728f07c
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
@@ -196,20 +196,15 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
     iphi = (1 + static_cast<int>(phi / indx.second)) % hgpar_->scintCells(layer);
   if (iphi == 0)
     iphi = hgpar_->scintCells(layer);
-  if (cassetteMode()) {
+  if (mode_ == HGCalGeometryMode::TrapezoidCassette) {
     int cassette = HGCalTileIndex::tileCassette(iphi, hgpar_->phiOffset_, hgpar_->nphiCassette_, hgpar_->cassettes_);
     auto cshift = hgcassette_.getShift(layer, -1, cassette);
 #ifdef EDM_ML_DEBUG
-    std::ostringstream st1;
-    st1 << "Cassette " << cassette << " Shift " << cshift.first << ":" << cshift.second << " Original " << xx << ":"
-        << yy;
+    edm::LogVerbatim("HGCalGeomT") << "Cassette " << cassette << " Shift " << cshift.first << ":" << cshift.second<< " Original " << xx << ":"
+				   << yy;
 #endif
     xx += (zside * cshift.first);
     yy -= cshift.second;
-#ifdef EDM_ML_DEBUG
-    st1 << " Shifted " << xx << ":" << yy;
-    edm::LogVerbatim("HGCalGeomT") << st1.str();
-#endif
   }
   type = hgpar_->scintType(layer);
   double r = std::sqrt(xx * xx + yy * yy);
@@ -947,19 +942,14 @@ std::pair<float, float> HGCalDDDConstants::locateCellTrap(
     y += hgpar_->yLayerHex_[ll];
     if (irad < 0)
       x = -x;
-    if (cassetteMode()) {
+    if (mode_ == HGCalGeometryMode::TrapezoidCassette) {
       int cassette = HGCalTileIndex::tileCassette(iphi, hgpar_->phiOffset_, hgpar_->nphiCassette_, hgpar_->cassettes_);
       auto cshift = hgcassette_.getShift(lay, -1, cassette);
-      std::ostringstream st1;
       if (debug)
-        st1 << "Cassette " << cassette << " Shift " << cshift.first << ":" << cshift.second << " Original " << x << ":"
-            << y;
+        edm::LogVerbatim("HGCalGeom") << "Cassette " << cassette << " Shift " << -(zside * cshift.first) << ":"
+                                      << cshift.second;
       x -= cshift.first;
       y += cshift.second;
-      if (debug) {
-        st1 << " Final " << x << ":" << y;
-        edm::LogVerbatim("HGCalGeom") << st1.str();
-      }
     }
   }
   if (!reco) {