Merge pull request #48812 from CMS-HGCAL/dev/unpacker_patch_rebase

Fix to unpacker / module locator for HGCAL

Author: cmsbuild

CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h

@@ -21,6 +21,8 @@
  */
 struct HGCalFEDReadoutSequence {
   uint32_t id;
+  //overall counters for total number of ECONs and Capture Blocks (useful to steer the unpacker behavior)
+  size_t totalECONs_, totalCBs_;
   /// look-up table (capture block, econd idx) -> internal dense index
   std::vector<int> moduleLUT_;
   /// dense sequence of modules in the readout: the type is the one in use in the cell mapping

CondFormats/HGCalObjects/src/HGCalMappingModuleIndexer.cc

@@ -82,16 +82,22 @@ void HGCalMappingModuleIndexer::finalize() {
   std::vector<uint32_t> typeCounters(globalTypesCounter_.size(), 0);
   for (auto& fedit : fedReadoutSequences_) {
     //assign the final indexing in the look-up table depending on which ECON-D's are really present
+    //count also the the number of capture blocks present
     size_t nconn(0);
     fedit.moduleLUT_.resize(fedit.readoutTypes_.size(), -1);
+    std::set<uint32_t> uniqueCB;
     for (size_t i = 0; i < fedit.readoutTypes_.size(); i++) {
       if (fedit.readoutTypes_[i] == -1)
         continue;  //unexisting
 
       reassignTypecodeLocation(fedit.id, i, nconn);
       fedit.moduleLUT_[i] = nconn;
       nconn++;
+
+      uniqueCB.insert(modFedIndexer_.unpackDenseIndex(i)[0]);
     }
+    fedit.totalECONs_ = nconn;
+    fedit.totalCBs_ = uniqueCB.size();
 
     //remove unexisting ECONs building a final compact readout sequence
     fedit.readoutTypes_.erase(

DataFormats/HGCalDigi/interface/HGCalFEDPacketInfoSoA.h

@@ -14,7 +14,7 @@ namespace hgcaldigi {
     constexpr uint8_t NormalUnpacking = 0, GenericUnpackError = 1, ErrorSLinkHeader = 2, ErrorPayload = 3,
                       ErrorCaptureBlockHeader = 4, ActiveCaptureBlockFlags = 5, ErrorECONDHeader = 6,
                       ECONDPayloadLengthOverflow = 7, ECONDPayloadLengthMismatch = 8, ErrorSLinkTrailer = 9,
-                      EarlySLinkEnd = 10;
+                      EarlySLinkEnd = 10, GenericUnpackWarning = 11;
   }  // namespace FEDUnpackingFlags
 
   inline constexpr bool isNotNormalFED(uint16_t fedUnpackingFlag) {

EventFilter/HGCalRawToDigi/plugins/HGCalRawToDigi.cc

@@ -159,7 +159,6 @@ uint16_t HGCalRawToDigi::callUnpacker(unsigned fedId,
 void HGCalRawToDigi::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("src", edm::InputTag("rawDataCollector"));
-  desc.add<std::vector<unsigned int> >("fedIds", {});
   desc.add<bool>("doSerial", true)->setComment("do not attempt to paralleize unpacking of different FEDs");
   desc.add<bool>("headersOnly", false)->setComment("unpack only headers");
   descriptions.add("hgcalDigis", desc);

EventFilter/HGCalRawToDigi/src/HGCalUnpacker.cc

@@ -102,7 +102,7 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
 
   // parse SLink body (capture blocks)
   bool hasActiveCBFlags(false);
-  for (uint32_t captureblockIdx = 0; captureblockIdx < HGCalMappingModuleIndexer::maxCBperFED_ && ptr < trailer - 2;
+  for (uint32_t captureblockIdx = 0; captureblockIdx < fedReadoutSequence.totalCBs_ && ptr < trailer - 2;
        captureblockIdx++) {
     // check capture block header (64b)
 
@@ -158,6 +158,11 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
       if (econd_pkt_status != backend::ECONDPacketStatus::InactiveECOND) {
         // always increment the global ECON-D index (unless inactive/unconnected)
         globalECONDIdx++;
+
+        //stop if we have all the ECON-Ds expected
+        if (globalECONDIdx >= fedReadoutSequence.totalECONs_) {
+          return (0x1 << hgcaldigi::FEDUnpackingFlags::GenericUnpackWarning);
+        }
       }
       LogDebug("[HGCalUnpacker]") << "fedId = " << fedId << ", captureblockIdx = " << captureblockIdx
                                   << ", econdIdx = " << econdIdx << ", globalECONDIdx = " << (int)globalECONDIdx

EventFilter/Utilities/src/DAQSourceModelsDTH.cc

@@ -512,7 +512,7 @@ int DataModeDTH::eventCounterCallback(
       edm::LogError("EvFDaqDirector") << "Invalid DTH header encountered";
       return fileClose();
     }
-    if (!oh->verifyMarker() || oh->version() != 1) {
+    if (!oh->verifyMarker() || (oh->version() != 1 && oh->version() != 2)) {
       edm::LogError("EvFDaqDirector") << "Unexpected DTH header version " << oh->version();
       return fileClose();
     }

Geometry/HGCalMapping/test/HGCalMappingESSourceTester.cc

@@ -148,9 +148,13 @@ void HGCalMappingESSourceTester::analyze(const edm::Event& iEvent, const edm::Ev
               frs.chDataOffsets_.end(),
               std::inserter(unique_chDataOffsets, unique_chDataOffsets.end()));
 
-    size_t nmods = frs.readoutTypes_.size();
+    assert(frs.readoutTypes_.size() == frs.totalECONs_);
+    size_t nmods = frs.totalECONs_;
+    if (nmods == 0)
+      continue;
     totalmods += nmods;
-    printf("\t[FED %d] packs data from %ld ECON-Ds - readout types -> (offsets) :", frs.id, nmods);
+    printf("\t[FED %d] packs data from %ld ECON-Ds - readout types -> (offsets)\n", frs.id, nmods);
+    printf("\tTotal capture blocks: %ld Total ECON-Ds %ld\n", frs.totalCBs_, frs.totalECONs_);
     for (size_t i = 0; i < nmods; i++) {
       printf("\t%d -> (%d;%d;%d)", frs.readoutTypes_[i], frs.modOffsets_[i], frs.erxOffsets_[i], frs.chDataOffsets_[i]);
     }
@@ -247,7 +251,7 @@ void HGCalMappingESSourceTester::analyze(const edm::Event& iEvent, const edm::Ev
   printf("\tTime: %f seconds\n", elapsed.count());
 
   HGCalElectronicsId eid(elecid);
-  assert(eid.localFEDId() == fedid);
+  assert(eid.localFEDId() == (fedid & HGCalElectronicsId::HGCalElectronicsIdMask::kLocalFEDIDMask));
   assert((uint32_t)eid.captureBlock() == captureblockidx);
   assert((uint32_t)eid.econdIdx() == econdidx);
   assert((uint32_t)eid.econdeRx() == (uint32_t)(2 * chip + half));
@@ -288,7 +292,8 @@ void HGCalMappingESSourceTester::analyze(const edm::Event& iEvent, const edm::Ev
   elapsed = stop - start;
   printf("\tTime: %f seconds\n", elapsed.count());
   eid = HGCalElectronicsId(elecid);
-  assert(eid.localFEDId() == modules.view()[modidx].fedid());
+  assert(eid.localFEDId() ==
+         (modules.view()[modidx].fedid() & HGCalElectronicsId::HGCalElectronicsIdMask::kLocalFEDIDMask));
   assert((uint32_t)eid.captureBlock() == modules.view()[modidx].captureblockidx());
   assert((uint32_t)eid.econdIdx() == modules.view()[modidx].econdidx());
   assert((uint32_t)eid.halfrocChannel() == cells.view()[cellidx].seq());