Fix fedId handling.

Author: hqucms

EventFilter/HGCalRawToDigi/plugins/HGCalRawToDigi.cc

@@ -104,6 +104,10 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   //serial unpacking calls
   if (doSerial_) {
     for (unsigned fedId = 0; fedId < moduleIndexer.fedCount(); ++fedId) {
+      const auto& frs = moduleIndexer.getFEDReadoutSequences()[fedId];
+      if (frs.readoutTypes_.empty()) {
+        continue;
+      }
       const auto& fed_data = raw_data.FEDData(fedId);
       fedPacketInfo.view()[fedId].FEDPayload() = fed_data.size();
       if (fed_data.size() == 0)
@@ -116,6 +120,10 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   else {
     oneapi::tbb::this_task_arena::isolate([&]() {
       oneapi::tbb::parallel_for(0U, moduleIndexer.fedCount(), [&](unsigned fedId) {
+        const auto& frs = moduleIndexer.getFEDReadoutSequences()[fedId];
+        if (frs.readoutTypes_.empty()) {
+          return;
+        }
         const auto& fed_data = raw_data.FEDData(fedId);
         fedPacketInfo.view()[fedId].FEDPayload() = fed_data.size();
         if (fed_data.size() == 0)

RecoLocalCalo/HGCalRecAlgos/plugins/HGCalConfigurationESProducer.cc

@@ -97,6 +97,7 @@ class HGCalConfigurationESProducer : public edm::ESProducer, public edm::EventSe
     // follow indexing by HGCalMappingModuleIndexer
     // HGCalConfiguration = container class holding FED structs of ECON-D structs of eRx structs
     std::unique_ptr<HGCalConfiguration> config_ = std::make_unique<HGCalConfiguration>();
+    config_->feds.resize(moduleMap.getMaxFEDSize());
     for (std::size_t fedid = 0; fedid < moduleMap.getMaxFEDSize(); ++fedid) {
       // sanity checks
       if (moduleMap.getFEDReadoutSequences()[fedid].readoutTypes_.empty())         // check if FED exists (non-empty)
@@ -153,7 +154,7 @@ class HGCalConfigurationESProducer : public edm::ESProducer, public edm::EventSe
         fed.econds[imod] = mod;  // add to FED's vector<HGCalECONDConfig> of ECON-D modules
       }
 
-      config_->feds.push_back(fed);  // add to config's vector of HGCalFedConfig FEDs
+      config_->feds[fedid] = fed;  // add to config's vector of HGCalFedConfig FEDs
     }
 
     // consistency check