Get BX,Orb,L1A from S-Link, CB, ECON-D headers

Author: yulunmiao

DataFormats/HGCalDigi/interface/HGCalECONDPacketInfoSoA.h

@@ -74,10 +74,14 @@ namespace hgcaldigi {
                       // If exception found before ECON-D, this would be 0
                       // Otherwise the payload length of the ECON-D
                       SOA_COLUMN(uint16_t, payloadLength),
-                      // Diffrence between the BX,L1A,Orbit number in the S-Link header and the ECON-D header
-                      SOA_COLUMN(int16_t, BXdifference),
-                      SOA_COLUMN(int8_t, L1Adifference),
-                      SOA_COLUMN(int8_t, Orbitdifference),
+                      // BX,L1A,Orbit number of the ECON-D
+                      SOA_COLUMN(uint16_t, BX),
+                      SOA_COLUMN(uint8_t, L1A),
+                      SOA_COLUMN(uint8_t, Orbit),
+                      // BX,L1A,Orbit number of the Capture Block
+                      SOA_COLUMN(uint16_t, CBBX),
+                      SOA_COLUMN(uint8_t, CBL1A),
+                      SOA_COLUMN(uint8_t, CBOrbit),
                       // Common modes
                       SOA_EIGEN_COLUMN(Matrix, cm))
   using HGCalECONDPacketInfoSoA = HGCalECONDPacketInfoSoALayout<>;

DataFormats/HGCalDigi/interface/HGCalFEDPacketInfoSoA.h

@@ -58,7 +58,11 @@ namespace hgcaldigi {
                       // bit 1 : unable to unpack data
                       // bit 2 : at least one capture block has active flags
                       SOA_COLUMN(uint16_t, FEDUnpackingFlag),
-                      SOA_COLUMN(uint32_t, FEDPayload))  //number of words (char)
+                      SOA_COLUMN(uint32_t, FEDPayload),  //number of words (char)
+                      // BX,L1A,Orbit number of the SLink
+                      SOA_COLUMN(uint16_t, FEDBX),
+                      SOA_COLUMN(uint64_t, FEDL1A),
+                      SOA_COLUMN(uint32_t, FEDOrbit))
 
   using HGCalFEDPacketInfoSoA = HGCalFEDPacketInfoSoALayout<>;
 }  // namespace hgcaldigi

DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h

@@ -32,7 +32,7 @@ namespace hgcal {
 
   namespace BACKEND_FRAME {
     constexpr uint32_t CAPTUREBLOCK_RESERVED_MASK = 0x7f, CAPTUREBLOCK_RESERVED_POS = 25, CAPTUREBLOCK_BC_MASK = 0xfff,
-                       CAPTUREBLOCK_BC_POS = 13, CAPTUREBLOCK_EC_MASK = 0x7f, CAPTUREBLOCK_EC_POS = 7,
+                       CAPTUREBLOCK_BC_POS = 13, CAPTUREBLOCK_EC_MASK = 0x3f, CAPTUREBLOCK_EC_POS = 7,
                        CAPTUREBLOCK_OC_MASK = 0x7, CAPTUREBLOCK_OC_POS = 4, SLINK_BOE_MASK = 0xff, SLINK_BOE_POS = 24,
                        SLINK_V_MASK = 0xf, SLINK_V_POS = 19, SLINK_R8_MASK = 0xff, SLINK_R8_POS = 11,
                        SLINK_GLOBAL_EVENTID_MSB_MASK = 0xfff, SLINK_GLOBAL_EVENTID_MSB_POS = 0,

EventFilter/HGCalRawToDigi/interface/HGCalUnpacker.h

@@ -14,6 +14,7 @@
 #include "DataFormats/HGCalDigi/interface/HGCalRawDataDefinitions.h"
 #include "DataFormats/FEDRawData/interface/FEDRawData.h"
 #include "DataFormats/HGCalDigi/interface/HGCalDigiHost.h"
+#include "DataFormats/HGCalDigi/interface/HGCalFEDPacketInfoHost.h"
 #include "DataFormats/HGCalDigi/interface/HGCalECONDPacketInfoHost.h"
 #include "CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h"
 #include "CondFormats/HGCalObjects/interface/HGCalConfiguration.h"
@@ -37,6 +38,7 @@ class HGCalUnpacker {
                         const HGCalMappingModuleIndexer& moduleIndexer,
                         const HGCalConfiguration& config,
                         hgcaldigi::HGCalDigiHost& digis,
+                        hgcaldigi::HGCalFEDPacketInfoHost& fedPacketInfo,
                         hgcaldigi::HGCalECONDPacketInfoHost& econdPacketInfo,
                         bool headerOnlyMode = false);
 

EventFilter/HGCalRawToDigi/plugins/HGCalRawToDigi.cc

@@ -33,6 +33,7 @@ class HGCalRawToDigi : public edm::stream::EDProducer<> {
                         const HGCalMappingModuleIndexer& moduleIndexer,
                         const HGCalConfiguration& config,
                         hgcaldigi::HGCalDigiHost& digis,
+                        hgcaldigi::HGCalFEDPacketInfoHost& fedPacketInfo,
                         hgcaldigi::HGCalECONDPacketInfoHost& econdPacketInfo);
   static void fillDescriptions(edm::ConfigurationDescriptions&);
 
@@ -109,7 +110,8 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
       if (fed_data.size() == 0)
         continue;
       fedPacketInfo.view()[fedId].FEDUnpackingFlag() =
-          callUnpacker(fedId, fed_data, moduleIndexer, config, digis, econdPacketInfo);
+          callUnpacker(fedId, fed_data, moduleIndexer, config, digis, fedPacketInfo, econdPacketInfo);
+      
     }
   }
   //parallel unpacking calls
@@ -121,7 +123,7 @@ void HGCalRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
         if (fed_data.size() == 0)
           return;
         fedPacketInfo.view()[fedId].FEDUnpackingFlag() =
-            callUnpacker(fedId, fed_data, moduleIndexer, config, digis, econdPacketInfo);
+            callUnpacker(fedId, fed_data, moduleIndexer, config, digis, fedPacketInfo, econdPacketInfo);
         return;
       });
     });
@@ -139,9 +141,10 @@ uint16_t HGCalRawToDigi::callUnpacker(unsigned fedId,
                                       const HGCalMappingModuleIndexer& moduleIndexer,
                                       const HGCalConfiguration& config,
                                       hgcaldigi::HGCalDigiHost& digis,
+                                      hgcaldigi::HGCalFEDPacketInfoHost& fedPacketInfo,
                                       hgcaldigi::HGCalECONDPacketInfoHost& econdPacketInfo) {
   uint16_t status =
-      unpacker_.parseFEDData(fedId, fed_data, moduleIndexer, config, digis, econdPacketInfo, headersOnly_);
+      unpacker_.parseFEDData(fedId, fed_data, moduleIndexer, config, digis, fedPacketInfo, econdPacketInfo, headersOnly_);
   return status;
 }
 

EventFilter/HGCalRawToDigi/src/HGCalUnpacker.cc

@@ -18,6 +18,7 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
                                      const HGCalMappingModuleIndexer& moduleIndexer,
                                      const HGCalConfiguration& config,
                                      hgcaldigi::HGCalDigiHost& digis,
+                                     hgcaldigi::HGCalFEDPacketInfoHost& fedPacketInfo,
                                      hgcaldigi::HGCalECONDPacketInfoHost& econdPacketInfo,
                                      bool headerOnlyMode) {
   // ReadoutSequence object for this FED
@@ -51,17 +52,18 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
   const auto* ptr = header;
 
   // read L1A number from the SLink header
-  int8_t L1ASLink = ((*(header + 1) >> BACKEND_FRAME::SLINK_GLOBAL_EVENTID_LSB_POS) &
-                     ECOND_FRAME::L1A_MASK);  // use mask in ECON-D to get lowest 6 bits
+  uint64_t SLinkL1Amask = (uint64_t(BACKEND_FRAME::SLINK_GLOBAL_EVENTID_MSB_MASK) << 32) |
+                          uint64_t(BACKEND_FRAME::SLINK_GLOBAL_EVENTID_LSB_MASK);
+  uint64_t L1ASLink = ((*(header + 1) >> BACKEND_FRAME::SLINK_GLOBAL_EVENTID_LSB_POS) & SLinkL1Amask);
   // read BX number and Orbit number from the SLink trailer
-  int16_t BXSLink = ((*(trailer - 1) >> BACKEND_FRAME::SLINK_BXID_POS) &
-                     ECOND_FRAME::BX_MASK);  // use mask in ECON-D to get lowest 12 bits
-  int8_t OrbitSLink = ((*(trailer - 2) >> (BACKEND_FRAME::SLINK_ORBID_POS + 32)) &
-                       ECOND_FRAME::ORBIT_MASK);  // use mask in ECON-D to get lowest 3 bits
+  uint16_t BXSLink = ((*(trailer - 1) >> BACKEND_FRAME::SLINK_BXID_POS) & BACKEND_FRAME::SLINK_BXID_MASK);
+  uint32_t OrbitSLink = ((*(trailer - 2) >> (BACKEND_FRAME::SLINK_ORBID_POS + 32)) & BACKEND_FRAME::SLINK_ORBID_MASK);
+  fedPacketInfo.view()[fedId].FEDL1A() = L1ASLink;
+  fedPacketInfo.view()[fedId].FEDBX() = BXSLink;
+  fedPacketInfo.view()[fedId].FEDOrbit() = OrbitSLink;
 #ifdef EDM_ML_DEBUG
-  LogDebug("[HGCalUnpacker]") << "Global BX number:" << std::dec << BXSLink;
-  LogDebug("[HGCalUnpacker]") << "Global L1A number:" << std::dec << (int)L1ASLink;
-  LogDebug("[HGCalUnpacker]") << "Global Orbit ID:" << std::dec << (int)OrbitSLink;
+  LogDebug("[HGCalUnpacker]") << "S-Link BX number:" << std::dec << BXSLink << ", L1A number:" << std::dec
+                              << (int)L1ASLink << ", Orbit ID:" << std::dec << (int)OrbitSLink;
 
   for (unsigned iword = 0; ptr < trailer; ++iword) {
     LogDebug("[HGCalUnpacker]") << std::setw(8) << iword << ": 0x" << std::hex << std::setfill('0') << std::setw(16)
@@ -100,6 +102,7 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
   for (uint32_t captureblockIdx = 0; captureblockIdx < HGCalMappingModuleIndexer::maxCBperFED_ && ptr < trailer - 2;
        captureblockIdx++) {
     // check capture block header (64b)
+
 #ifdef EDM_ML_DEBUG
     LogDebug("[HGCalUnpacker]") << "@" << std::setw(8) << std::distance(header, ptr) << ": 0x" << std::hex
                                 << std::setfill('0') << std::setw(16) << *ptr << std::dec;
@@ -141,6 +144,16 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
                                          << " from 0x" << cb_header << ".";
       return (0x1 << hgcaldigi::FEDUnpackingFlags::ErrorCaptureBlockHeader);
     }
+    uint16_t BXCaptureBlock =
+        ((cb_header >> (BACKEND_FRAME::CAPTUREBLOCK_BC_POS + 32)) & BACKEND_FRAME::CAPTUREBLOCK_BC_MASK);
+    uint8_t L1ACaptureBlock =
+        ((cb_header >> (BACKEND_FRAME::CAPTUREBLOCK_EC_POS + 32)) & BACKEND_FRAME::CAPTUREBLOCK_EC_MASK);
+    uint8_t OrbitCaptureBlock =
+        ((cb_header >> (BACKEND_FRAME::CAPTUREBLOCK_OC_POS + 32)) & BACKEND_FRAME::CAPTUREBLOCK_OC_MASK);
+#ifdef EDM_ML_DEBUG
+    LogDebug("[HGCalUnpacker]") << "CB BX number:" << std::dec << BXCaptureBlock << ", L1A number:" << std::dec
+                                << (int)L1ACaptureBlock << ", Orbit number:" << std::dec << (int)OrbitCaptureBlock;
+#endif
     ++ptr;
 
     // parse Capture Block body (ECON-Ds)
@@ -176,22 +189,18 @@ uint16_t HGCalUnpacker::parseFEDData(unsigned fedId,
       const auto econd_payload_length = ((econd_headers[0] >> ECOND_FRAME::PAYLOAD_POS) & ECOND_FRAME::PAYLOAD_MASK);
 
       // read BX, L1A, and Orbit number from the ECON-D header
-      int16_t BXECOND = ((econd_headers[1] >> ECOND_FRAME::BX_POS) & ECOND_FRAME::BX_MASK);
-      int8_t L1AECOND = ((econd_headers[1] >> ECOND_FRAME::L1A_POS) & ECOND_FRAME::L1A_MASK);
-      int8_t OrbitECOND = ((econd_headers[1] >> ECOND_FRAME::ORBIT_POS) & ECOND_FRAME::ORBIT_MASK);
-      // save the difference between the SLink and ECON-D BX, L1A, and Orbit numbers(ECON-D - SLink)
-      econdPacketInfo.view()[ECONDdenseIdx].BXdifference() = BXECOND - BXSLink;
-      econdPacketInfo.view()[ECONDdenseIdx].L1Adifference() = L1AECOND - L1ASLink;
-      econdPacketInfo.view()[ECONDdenseIdx].Orbitdifference() = OrbitECOND - OrbitSLink;
+      uint16_t BXECOND = ((econd_headers[1] >> ECOND_FRAME::BX_POS) & ECOND_FRAME::BX_MASK);
+      uint8_t L1AECOND = ((econd_headers[1] >> ECOND_FRAME::L1A_POS) & ECOND_FRAME::L1A_MASK);
+      uint8_t OrbitECOND = ((econd_headers[1] >> ECOND_FRAME::ORBIT_POS) & ECOND_FRAME::ORBIT_MASK);
+      econdPacketInfo.view()[ECONDdenseIdx].BX() = BXECOND;
+      econdPacketInfo.view()[ECONDdenseIdx].L1A() = L1AECOND;
+      econdPacketInfo.view()[ECONDdenseIdx].Orbit() = OrbitECOND;
+      econdPacketInfo.view()[ECONDdenseIdx].CBBX() = BXCaptureBlock;
+      econdPacketInfo.view()[ECONDdenseIdx].CBL1A() = L1ACaptureBlock;
+      econdPacketInfo.view()[ECONDdenseIdx].CBOrbit() = OrbitCaptureBlock;
 #ifdef EDM_ML_DEBUG
-      LogDebug("[HGCalUnpacker]") << "SLink BX number:" << std::dec << BXSLink << ", ECON-D BX number:" << std::dec
-                                  << BXECOND << ", difference:" << econdPacketInfo.view()[ECONDdenseIdx].BXdifference();
-      LogDebug("[HGCalUnpacker]") << "SLink L1A number:" << std::dec << (int)L1ASLink
-                                  << ", ECON-D L1A number:" << std::dec << (int)L1AECOND
-                                  << ", difference:" << (int)econdPacketInfo.view()[ECONDdenseIdx].L1Adifference();
-      LogDebug("[HGCalUnpacker]") << "SLink Orbit number:" << std::dec << (int)OrbitSLink
-                                  << ", ECON-D Orbit number:" << std::dec << (int)OrbitECOND
-                                  << ", difference:" << (int)econdPacketInfo.view()[ECONDdenseIdx].Orbitdifference();
+      LogDebug("[HGCalUnpacker]") << "ECON-D BX number:" << std::dec << BXECOND << ", L1A number:" << std::dec
+                                  << (int)L1AECOND << ", Orbit number:" << std::dec << (int)OrbitECOND;
 #endif
       // sanity check
       if (((econd_headers[0] >> ECOND_FRAME::HEADER_POS) & ECOND_FRAME::HEADER_MASK) !=