Fix the ieta=16 issue for HCAL simulation in the GEN-SIM step - backp…

…ort of #42105

Geometry/HcalCommonData/src/HcalNumberingFromDDD.cc

@@ -17,13 +17,13 @@ using namespace geant_units::operators;
 
 HcalNumberingFromDDD::HcalNumberingFromDDD(const HcalDDDSimConstants* hcons) : hcalConstants(hcons) {
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "Creating HcalNumberingFromDDD\n";
+  edm::LogVerbatim("HCalGeom") << "Creating HcalNumberingFromDDD";
 #endif
 }
 
 HcalNumberingFromDDD::~HcalNumberingFromDDD() {
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "Deleting HcalNumberingFromDDD\n";
+  edm::LogVerbatim("HCalGeom") << "Deleting HcalNumberingFromDDD";
 #endif
 }
 
@@ -86,7 +86,7 @@ HcalNumberingFromDDD::HcalID HcalNumberingFromDDD::unitID(int det, double etaR,
 
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HCalGeom") << "HcalNumberingFromDDD: etaR = " << etaR << " : " << zside << "/" << ieta << " phi "
-                               << hphi << " : " << iphi << std::endl;
+                               << hphi << " : " << iphi;
 #endif
   return unitID(det, zside, depth, ieta, iphi, lay);
 }
@@ -99,6 +99,9 @@ HcalNumberingFromDDD::HcalID HcalNumberingFromDDD::unitID(
   int units = hcalConstants->unitPhi(det, etaR);
   int iphi_skip = hcalConstants->phiNumber(phi, units);
 
+  if ((lay == 1) && (etaR == 16))
+    etaR = 15;
+
   std::pair<int, int> etaDepth = hcalConstants->getEtaDepth(det, etaR, iphi_skip, zside, depth, lay);
 
 #ifdef EDM_ML_DEBUG