Merge pull request #14158 from UMN-CMS/HcalUnpackerPatch

uMNio data skipping implemented for urgent HLT patch
cms-sw · Apr 21, 2016 · 9d0f95d · 9d0f95d
2 parents 7861e34 + 9f195f4
commit 9d0f95d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/EventFilter/HcalRawToDigi/src/HcalUnpacker.cc b/EventFilter/HcalRawToDigi/src/HcalUnpacker.cc
@@ -588,6 +588,8 @@ void HcalUnpacker::unpackUTCA(const FEDRawData& raw, const HcalElectronicsMap& e
     int nps=(amc13->AMCId(iamc)>>12)&0xF;
 
     HcalUHTRData uhtr(amc13->AMCPayload(iamc),amc13->AMCSize(iamc));
+    //Check to make sure uMNio is not unpacked here
+    if(uhtr.getFormatVersion() != 1) continue;
 #ifdef DebugLog
     //debug printouts
     int nwords=uhtr.getRawLengthBytes()/2;