Backport cms-sw#39920 to protect against wrong ieta values which happ…

…ens for wrong mixing of signal and PU SIM results
bsunanda · Oct 29, 2022 · b131be5 · b131be5
1 parent c3c952c
commit b131be5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CondFormats/GeometryObjects/interface/HcalParameters.h b/CondFormats/GeometryObjects/interface/HcalParameters.h
@@ -5,8 +5,8 @@
 
 class HcalParameters {
 public:
-  HcalParameters(void) {}
-  ~HcalParameters(void) {}
+  HcalParameters(void) = default;
+  ~HcalParameters(void) = default;
 
   struct LayerItem {
     unsigned int layer;
@@ -63,6 +63,7 @@ class HcalParameters {
   std::vector<LayerItem> layerGroupEtaSim, layerGroupEtaRec;
   int topologyMode;
 
+  uint32_t etaMaxHBHE() const { return static_cast<uint32_t>(etagroup.size()); }
   COND_SERIALIZABLE;
 };
 

diff --git a/Geometry/HcalCommonData/src/HcalDDDRecConstants.cc b/Geometry/HcalCommonData/src/HcalDDDRecConstants.cc
@@ -28,6 +28,9 @@ HcalDDDRecConstants::~HcalDDDRecConstants() {
 }
 
 std::vector<int> HcalDDDRecConstants::getDepth(const unsigned int& eta, const bool& extra) const {
+  if (eta > hpar->etaMaxHBHE())
+    throw cms::Exception("HcalDDDRecConstants")
+        << "getDepth: receives an eta value " << eta << " outside the limit (1:" << hpar->etaMaxHBHE() << ")";
   if (!extra) {
     std::vector<HcalParameters::LayerItem>::const_iterator last = hpar->layerGroupEtaRec.begin();
     for (std::vector<HcalParameters::LayerItem>::const_iterator it = hpar->layerGroupEtaRec.begin();
@@ -160,8 +163,11 @@ std::pair<double, double> HcalDDDRecConstants::getEtaPhi(const int& subdet, cons
 }
 
 HcalDDDRecConstants::HcalID HcalDDDRecConstants::getHCID(int subdet, int keta, int iphi, int lay, int idepth) const {
-  int ieta = (keta > 0) ? keta : -keta;
+  uint32_t ieta = (keta > 0) ? keta : -keta;
   int zside = (keta > 0) ? 1 : -1;
+  if (ieta > hpar->etaMaxHBHE())
+    throw cms::Exception("HcalDDDRecConstants")
+        << "getHCID: receives an eta value " << ieta << " outside the limit (1:" << hpar->etaMaxHBHE() << ")";
   int eta(ieta), phi(iphi), depth(idepth);
   if ((subdet == static_cast<int>(HcalOuter)) ||
       ((subdet == static_cast<int>(HcalBarrel)) && (lay > maxLayerHB_ + 1))) {