TPC: add trigger handling in ILBZS

wiechula · davidrohr · commit 90af7dfd3bda · 2022-07-13T00:29:15.000+02:00
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/ZeroSuppressionLinkBased.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/ZeroSuppressionLinkBased.h
@@ -77,7 +77,7 @@ struct Header final : public CommonHeader {
     return std::bitset<80>((std::bitset<80>(bitMaskHigh) << 64) | std::bitset<80>(bitMaskLow));
   }
 
-  bool isFillWord() const { return ((word0 == 0xffffffffffffffff) && (word1 == 0xffffffffffffffff)) || ((word0 == 0x0000000000000000) && (word1 == 0x0000000000000000)); }
+  bool isFillWord() const { return ((word0 == 0xffffffffffffffff) && (word1 == 0xffffffffffffffff)); }
 };
 
 /// ADC data container
@@ -282,6 +282,37 @@ struct TriggerContainer {
   uint32_t getTriggerType() const { return triggerInfo.getTriggerType(); }
 };
 
+/// Data definition of trigger bits in ILBZS format
+struct TriggerWord {
+  static constexpr uint16_t HasTrigger = 0x8;
+  static constexpr uint16_t LaserTriggerMask = 0x4;
+  static constexpr uint16_t PulserTriggerMask = 0x2;
+  static constexpr uint16_t PhysicsTriggerMask = 0x1;
+
+  union {
+    uint16_t word = 0;
+    struct {
+      uint16_t bunchCrossing : 12;
+      uint16_t triggerType : 4;
+    };
+  };
+
+  bool hasTrigger() const { return triggerType & HasTrigger; }
+  bool hasLaserTrigger() const { return triggerType & LaserTriggerMask; }
+  bool hasPulserTrigger() const { return triggerType & PulserTriggerMask; }
+  bool hasPhysicsTrigger() const { return triggerType & PhysicsTriggerMask; }
+};
+
+/// Trigger word of ILBZS
+///
+/// 128 bits, can hold up to 8 trigger information
+struct TriggerInfoV3 {
+  uint64_t word0 = 0;
+  uint64_t word1 = 0;
+
+  bool hasTrigger() const { return word0 & TriggerWord::HasTrigger; }
+  uint16_t getFirstBC() const { return word0 & 0xFFF; }
+};
 #endif // !defined(GPUCA_GPUCODE)
 
 } // namespace zerosupp_link_based
diff --git a/Detectors/TPC/reconstruction/src/RawProcessingHelpers.cxx b/Detectors/TPC/reconstruction/src/RawProcessingHelpers.cxx
@@ -59,7 +59,7 @@ bool raw_processing_helpers::processZSdata(const char* data, size_t size, rdh_ut
     if (!header.hasCorrectMagicWord()) {
       zsdata = (zerosupp_link_based::ContainerZS*)((const char*)zsdata + sizeof(zerosupp_link_based::Header));
       if (!header.isFillWord()) {
-        LOGP(error, "Bad LinkZS magic word (0x{:08x}), for feeId 0x{:05x} (CRU: {:3}, link: {:2}, EP {}) , skipping data block", header.magicWord, feeId, rdh_utils::getCRU(feeId), rdh_utils::getLink(feeId), rdh_utils::getEndPoint(feeId));
+        LOGP(error, "Bad LinkZS magic word (0x{:08x}), for feeId 0x{:05x} (CRU: {:3}, link: {:2}, EP {}), orbit {} , skipping data block", header.magicWord, feeId, cruID, link, endPoint, orbit);
         LOGP(error, "Full 128b word is: 0x{:016x}{:016x}", header.word1, header.word0);
       }
       continue;
@@ -88,7 +88,15 @@ bool raw_processing_helpers::processZSdata(const char* data, size_t size, rdh_ut
       const auto& metaHDR = *((TPCZSHDRV2*)zsdata);
       zsVersion = metaHDR.version;
       timeOffset = metaHDR.timeOffset;
-      zsdata = (zerosupp_link_based::ContainerZS*)((const char*)zsdata + sizeof(zerosupp_link_based::Header));
+
+      const auto& triggerInfo = *(zerosupp_link_based::TriggerInfoV3*)((const char*)&metaHDR + sizeof(metaHDR));
+      if (triggerInfo.hasTrigger()) {
+        const auto triggerBC = triggerInfo.getFirstBC();
+        const auto triggerOrbit = orbit;
+        triggerBCOffset = (int(triggerOrbit) - int(referenceOrbit)) * maxBunches + triggerBC;
+      }
+
+      zsdata = (zerosupp_link_based::ContainerZS*)((const char*)&triggerInfo + sizeof(triggerInfo));
       continue;
     }
 
@@ -108,7 +116,7 @@ bool raw_processing_helpers::processZSdata(const char* data, size_t size, rdh_ut
     const int bcOffset = timeOffset + globalBCOffset + bunchCrossingHeader - triggerBCOffset;
     if (bcOffset < 0) {
       LOGP(info, "skipping time bin with negative BC offset timeOffset {} + globalBCoffset (({} - {}) * {} = {}) + bunchCrossingHeader ({}) - triggerBCOffset({}) = {}",
-           timeOffset, orbit, referenceOrbit, o2::constants::lhc::LHCMaxBunches, globalBCOffset, bunchCrossingHeader, syncOffsetReference, bunchCrossingHeader, syncOffset, triggerBCOffset, bcOffset);
+           timeOffset, orbit, referenceOrbit, o2::constants::lhc::LHCMaxBunches, globalBCOffset, bunchCrossingHeader, triggerBCOffset, bcOffset);
 
       // go to next time bin
       zsdata = zsdata->next();
