Merge pull request #42330 from aloeliger/bxVectorbxCheck_13_1

[13_1_X] Add BX boundary checks for BXVector push_back
cms-sw · Jul 23, 2023 · 91d6622 · 91d6622
2 parents ef77fef + d73c248
commit 91d6622
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/DataFormats/L1Trigger/BuildFile.xml b/DataFormats/L1Trigger/BuildFile.xml
@@ -5,6 +5,7 @@
 <use name="DataFormats/L1TrackTrigger"/>
 <use name="DataFormats/HcalDetId"/>
 <use name="FWCore/Concurrency"/>
+<use name="FWCore/MessageLogger"/>
 <use name="hls"/>
 <export>
   <lib name="1"/>

diff --git a/DataFormats/L1Trigger/interface/BXVector.icc b/DataFormats/L1Trigger/interface/BXVector.icc
@@ -5,6 +5,8 @@
 #include <iostream>
 using namespace std;
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+
 template <class T>
 BXVector<T>::BXVector(unsigned size,  // number of objects per BX
                       int bxFirst,    // first BX stored
@@ -131,11 +133,17 @@ unsigned BXVector<T>::size(int bx) const {
 // add element with given BX index
 template <class T>
 void BXVector<T>::push_back(int bx, T object) {
-  data_.insert(data_.begin() + itrs_[indexFromBX(bx)] + size(bx), object);
-  for (unsigned k = 0; k < itrs_.size(); k++) {
-    if (k > indexFromBX(bx)) {
-      itrs_[k]++;
+  if (bx >= bxFirst_ && bx <= bxLast_) {
+    data_.insert(data_.begin() + itrs_[indexFromBX(bx)] + size(bx), object);
+    for (unsigned k = 0; k < itrs_.size(); k++) {
+      if (k > indexFromBX(bx)) {
+        itrs_[k]++;
+      }
     }
+  } else {
+    edm::LogWarning("BXVectorBXViolation")
+        << "Something attempted to push to a BXVector BX that does not exist. The data will be ignored. bx: " << bx
+        << " bxFirst: " << bxFirst_ << " bxLast: " << bxLast_;
   }
 }