Merge pull request cms-sw#87 from thomreis/l1t-muon-CMSSW_7_6_0_pre5_…

…muon_unpacker_fix merged
thomreis · Nov 6, 2015 · 1992dcc · 1992dcc
2 parents 2065ef2 + 45073f2
commit 1992dcc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/EventFilter/L1TRawToDigi/src/implementations_stage2/MuonUnpacker.cc b/EventFilter/L1TRawToDigi/src/implementations_stage2/MuonUnpacker.cc
@@ -44,7 +44,7 @@ namespace l1t {
 
          // Loop over multiple BX and then number of muons filling muon collection
          for (int bx = firstBX; bx <= lastBX; ++bx) {
-            for (unsigned nWord = 0; nWord < nWords; nWord += 2) {
+            for (unsigned nWord = 0; nWord < nWords && i < block.header().getSize(); nWord += 2) {
                uint32_t raw_data_00_31 = payload[i++];
                uint32_t raw_data_32_63 = payload[i++];        
                LogDebug("L1T|Muon") << "raw_data_00_31 = 0x" << hex << raw_data_00_31 << " raw_data_32_63 = 0x" << raw_data_32_63;

diff --git a/EventFilter/L1TRawToDigi/src/implementations_stage2/RegionalMuonGMTUnpacker.cc b/EventFilter/L1TRawToDigi/src/implementations_stage2/RegionalMuonGMTUnpacker.cc
@@ -74,7 +74,7 @@ namespace l1t {
 
          // Loop over multiple BX and then number of muons filling muon collection
          for (int bx = firstBX; bx <= lastBX; ++bx) {
-            for (unsigned nWord = 0; nWord < nWords; nWord += 2) {
+            for (unsigned nWord = 0; nWord < nWords && i < block.header().getSize(); nWord += 2) {
                uint32_t raw_data_00_31 = payload[i++];
                uint32_t raw_data_32_63 = payload[i++];        
                LogDebug("L1T|Muon") << "raw_data_00_31 = 0x" << hex << raw_data_00_31 << " raw_data_32_63 = 0x" << raw_data_32_63;