Squashed commit of the following:

commit 488db5b
Author: Pedro Silva <[email protected]>
Date:   Thu Sep 18 10:57:11 2025 +0200

    add fallback in case PhaseI raw data is still used (TB2023/2024+EESR) (#172)

commit 58ec4d0
Author: Pedro <[email protected]>
Date:   Thu Sep 11 10:18:22 2025 +0200

    code checks/format

commit 216cfce
Author: Pedro <[email protected]>
Date:   Thu Sep 11 10:12:58 2025 +0200

    update

Co-authored-by: Pedro Silva <[email protected]>

Author: pfs

EventFilter/HGCalRawToDigi/interface/HGCalUnpacker.h

@@ -12,7 +12,7 @@
 #define EventFilter_HGCalRawToDigi_HGCalUnpacker_h
 
 #include "DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h"
-#include "DataFormats/FEDRawData/interface/FEDRawData.h"
+#include "DataFormats/FEDRawData/interface/RawDataBuffer.h"
 #include "DataFormats/HGCalDigi/interface/HGCalDigiHost.h"
 #include "DataFormats/HGCalDigi/interface/HGCalFEDPacketInfoHost.h"
 #include "DataFormats/HGCalDigi/interface/HGCalECONDPacketInfoHost.h"
@@ -34,14 +34,24 @@ class HGCalUnpacker {
   // HGCalUnpacker(HGCalUnpackerConfig config);
 
   uint16_t parseFEDData(unsigned fedId,
-                        const FEDRawData& fed_data,
+                        const RawFragmentWrapper& fed_data,
                         const HGCalMappingModuleIndexer& moduleIndexer,
                         const HGCalConfiguration& config,
                         hgcaldigi::HGCalDigiHost& digis,
                         hgcaldigi::HGCalFEDPacketInfoHost& fedPacketInfo,
                         hgcaldigi::HGCalECONDPacketInfoHost& econdPacketInfo,
                         bool headerOnlyMode = false);
 
+  uint16_t parseFEDData(unsigned fedId,
+                        const unsigned char* start_fed_data,
+                        size_t fed_data_size,
+                        const HGCalMappingModuleIndexer& moduleIndexer,
+                        const HGCalConfiguration& config,
+                        hgcaldigi::HGCalDigiHost& digis,
+                        hgcaldigi::HGCalFEDPacketInfoHost& fedPacketInfo,
+                        hgcaldigi::HGCalECONDPacketInfoHost& econdPacketInfo,
+                        bool headerOnlyMode);
+
 private:
   constexpr static uint8_t tctp_[16] = {
       0b00, 0b00, 0b01, 0b00, 0b00, 0b00, 0b00, 0b00, 0b10, 0b10, 0b10, 0b10, 0b11, 0b11, 0b11, 0b11};

EventFilter/HGCalRawToDigi/plugins/HGCalRawToDigi.cc

@@ -8,7 +8,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
 
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
+#include "DataFormats/FEDRawData/interface/RawDataBuffer.h"
 #include "DataFormats/HGCalDigi/interface/HGCalElectronicsId.h"
 #include "DataFormats/HGCalDigi/interface/HGCalDigiHost.h"
 #include "DataFormats/HGCalDigi/interface/HGCalECONDPacketInfoHost.h"
@@ -29,7 +29,7 @@ class HGCalRawToDigi : public edm::stream::EDProducer<> {
 public:
   explicit HGCalRawToDigi(const edm::ParameterSet&);
   uint16_t callUnpacker(unsigned fedId,
-                        const FEDRawData& fed_data,
+                        const RawFragmentWrapper& fed_data,
                         const HGCalMappingModuleIndexer& moduleIndexer,
                         const HGCalConfiguration& config,
                         hgcaldigi::HGCalDigiHost& digis,
@@ -42,7 +42,7 @@ class HGCalRawToDigi : public edm::stream::EDProducer<> {
   void beginRun(edm::Run const&, edm::EventSetup const&) override;
 
   // input tokens
-  const edm::EDGetTokenT<FEDRawDataCollection> fedRawToken_;
+  const edm::EDGetTokenT<RawDataBuffer> fedRawToken_;
 
   // output tokens
   const edm::EDPutTokenT<hgcaldigi::HGCalDigiHost> digisToken_;
@@ -70,7 +70,7 @@ class HGCalRawToDigi : public edm::stream::EDProducer<> {
 };
 
 HGCalRawToDigi::HGCalRawToDigi(const edm::ParameterSet& iConfig)
-    : fedRawToken_(consumes<FEDRawDataCollection>(iConfig.getParameter<edm::InputTag>("src"))),
+    : fedRawToken_(consumes<RawDataBuffer>(iConfig.getParameter<edm::InputTag>("src"))),
       digisToken_(produces<hgcaldigi::HGCalDigiHost>()),
       econdPacketInfoToken_(produces<hgcaldigi::HGCalECONDPacketInfoHost>()),
       fedPacketInfoToken_(produces<hgcaldigi::HGCalFEDPacketInfoHost>()),
@@ -96,7 +96,7 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   hgcaldigi::HGCalFEDPacketInfoHost fedPacketInfo(moduleIndexer.fedCount(), cms::alpakatools::host());
 
   // retrieve the FED raw data
-  const auto& raw_data = iEvent.get(fedRawToken_);
+  const auto& fedBuffer = iEvent.get(fedRawToken_);
 
   for (int32_t i = 0; i < digis.view().metadata().size(); i++) {
     digis.view()[i].flags() = hgcal::DIGI_FLAG::NotAvailable;
@@ -109,7 +109,8 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
       if (frs.readoutTypes_.empty()) {
         continue;
       }
-      const auto& fed_data = raw_data.FEDData(fedId);
+
+      const auto& fed_data = fedBuffer.fragmentData(fedId);
       fedPacketInfo.view()[fedId].FEDPayload() = fed_data.size();
       if (fed_data.size() == 0)
         continue;
@@ -125,7 +126,7 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
         if (frs.readoutTypes_.empty()) {
           return;
         }
-        const auto& fed_data = raw_data.FEDData(fedId);
+        const auto& fed_data = fedBuffer.fragmentData(fedId);
         fedPacketInfo.view()[fedId].FEDPayload() = fed_data.size();
         if (fed_data.size() == 0)
           return;
@@ -144,7 +145,7 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
 //
 uint16_t HGCalRawToDigi::callUnpacker(unsigned fedId,
-                                      const FEDRawData& fed_data,
+                                      const RawFragmentWrapper& fed_data,
                                       const HGCalMappingModuleIndexer& moduleIndexer,
                                       const HGCalConfiguration& config,
                                       hgcaldigi::HGCalDigiHost& digis,

EventFilter/HGCalRawToDigi/src/HGCalUnpacker.cc

@@ -7,7 +7,7 @@
 
 #include "CondFormats/HGCalObjects/interface/HGCalMappingCellIndexer.h"
 #include "CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h"
-#include "DataFormats/FEDRawData/interface/FEDRawData.h"
+#include "DataFormats/FEDRawData/interface/RawDataBuffer.h"
 #include "DataFormats/HGCalDigi/interface/HGCalDigiHost.h"
 #include "DataFormats/HGCalDigi/interface/HGCalECONDPacketInfoHost.h"
 #include "DataFormats/HGCalDigi/interface/HGCalFEDPacketInfoHost.h"
@@ -20,7 +20,29 @@
 using namespace hgcal;
 
 uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
-                                     const FEDRawData& fed_data,
+                                     const RawFragmentWrapper& fed_data,
+                                     const HGCalMappingModuleIndexer& moduleIndexer,
+                                     const HGCalConfiguration& config,
+                                     hgcaldigi::HGCalDigiHost& digis,
+                                     hgcaldigi::HGCalFEDPacketInfoHost& fedPacketInfo,
+                                     hgcaldigi::HGCalECONDPacketInfoHost& econdPacketInfo,
+                                     bool headerOnlyMode) {
+  const auto fed_data_size = fed_data.size();
+  const auto* start_fed_data = &(fed_data.data().front());
+  return parseFEDData(fedId,
+                      start_fed_data,
+                      fed_data_size,
+                      moduleIndexer,
+                      config,
+                      digis,
+                      fedPacketInfo,
+                      econdPacketInfo,
+                      headerOnlyMode);
+}
+
+uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
+                                     const unsigned char* start_fed_data,
+                                     size_t fed_data_size,
                                      const HGCalMappingModuleIndexer& moduleIndexer,
                                      const HGCalConfiguration& config,
                                      hgcaldigi::HGCalDigiHost& digis,
@@ -50,8 +72,8 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
   // Endianness assumption
   // From 32-bit word(ECOND) to 64-bit word(capture block): little endianness
   // Others: big endianness
-  const auto* const header = reinterpret_cast<const uint64_t*>(fed_data.data());
-  const auto* const trailer = reinterpret_cast<const uint64_t*>(fed_data.data() + fed_data.size());
+  const auto* const header = reinterpret_cast<const uint64_t*>(start_fed_data);
+  const auto* const trailer = reinterpret_cast<const uint64_t*>(start_fed_data + fed_data_size);
   LogDebug("[HGCalUnpacker]") << "fedId = " << fedId << ", nwords (64b) = " << std::distance(header, trailer);
   const auto* ptr = header;
 
@@ -120,7 +142,7 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
       uint32_t ECONDdenseIdx = moduleIndexer.getIndexForModule(fedId, 0);
       econdPacketInfo.view()[ECONDdenseIdx].location() = (uint32_t)(ptr - header);
       if (cb_header == 0x0) {
-        auto nToEnd = (fed_data.size() / 8 - 2) - std::distance(header, ptr);
+        auto nToEnd = (fed_data_size / 8 - 2) - std::distance(header, ptr);
         if (nToEnd == 1) {
           ptr++;
           LogDebug("[HGCalUnpacker]")