TPC: Add new trigger info handling

wiechula · shahor02 · commit bc81342f1a6c · 2022-05-07T23:12:49.000+04:00
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/ZeroSuppressionLinkBased.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/ZeroSuppressionLinkBased.h
@@ -32,6 +32,7 @@ static constexpr uint32_t DataWordSizeBytes = DataWordSizeBits / 8; ///< size of
 struct CommonHeader {
   static constexpr uint32_t MagicWordLinkZS = 0xFC;
   static constexpr uint32_t MagicWordTrigger = 0xAA;
+  static constexpr uint32_t MagicWordTriggerV2 = 0xAB;
 
   union {
     uint64_t word0 = 0;                        ///< lower 64 bits
@@ -52,9 +53,10 @@ struct CommonHeader {
     };
   };
 
-  bool hasCorrectMagicWord() const { return (magicWord == MagicWordLinkZS) || (magicWord == MagicWordTrigger); }
+  bool hasCorrectMagicWord() const { return (magicWord == MagicWordLinkZS) || (magicWord == MagicWordTrigger) || (magicWord == MagicWordTriggerV2); }
   bool isLinkZS() const { return (magicWord == MagicWordLinkZS); }
   bool isTriggerInfo() const { return (magicWord == MagicWordTrigger); }
+  bool isTriggerInfoV2() const { return (magicWord == MagicWordTriggerV2); }
 };
 
 /// header definition of the zero suppressed link based data format
@@ -240,6 +242,28 @@ struct TriggerInfo {
   uint32_t getTriggerType() const { return (triggerTypeHigh << 20) + triggerTypeLow; }
 };
 
+/// Data definition for the new trigger information after FW update, allowing for interleaved triggers
+struct TriggerInfoV2 {
+  union {
+    uint64_t word0 = 0;             ///< lower 64 bits
+    struct {                        ///
+      uint32_t triggerType;         ///< tigger type
+      uint32_t orbit;               ///< orbit number
+    };                              ///
+  };                                ///
+                                    ///
+  union {                           ///
+    uint64_t word1 = 0;             ///< upper bits of the 80 bit bitmask
+    struct {                        ///
+      uint32_t bunchCrossing : 12;  ///< bunch crossing number
+      uint32_t empty1_0 : 16;       ///< empty
+      uint32_t numWordsPayload : 4; ///< number of 128bit words with 12bit ADC values, should always be 0
+      uint32_t empty1_1 : 24;       ///< empty
+      uint32_t magicWord : 8;       ///< magic word for identification
+    };
+  };
+};
+
 /// Container for Trigger information, header + data
 struct TriggerContainer {
   CommonHeader header;
diff --git a/Detectors/TPC/reconstruction/src/RawProcessingHelpers.cxx b/Detectors/TPC/reconstruction/src/RawProcessingHelpers.cxx
@@ -69,7 +69,16 @@ bool raw_processing_helpers::processZSdata(const char* data, size_t size, rdh_ut
       const auto triggerBC = triggerInfo->triggerInfo.bunchCrossing;
       triggerBCOffset = (int(triggerOrbit) - int(referenceOrbit)) * maxBunches + triggerBC;
       LOGP(debug, "orbit: {}, triggerOrbit: {}, triggerBC: {}, triggerBCOffset: {}", orbit, triggerOrbit, triggerBC, triggerBCOffset);
-      zsdata = (zerosupp_link_based::ContainerZS*)((const char*)zsdata + sizeof(zerosupp_link_based::Header) * (1 + header.numWordsPayload));
+      zsdata = zsdata->next();
+      continue;
+    } else if (header.isTriggerInfoV2()) {
+      // for the moment only skip the trigger info
+      const auto triggerInfo = (zerosupp_link_based::TriggerInfoV2*)zsdata;
+      const auto triggerOrbit = triggerInfo->orbit;
+      const auto triggerBC = triggerInfo->bunchCrossing;
+      triggerBCOffset = (int(triggerOrbit) - int(referenceOrbit)) * maxBunches + triggerBC;
+      LOGP(debug, "orbit: {}, triggerOrbit: {}, triggerBC: {}, triggerBCOffset: {}", orbit, triggerOrbit, triggerBC, triggerBCOffset);
+      zsdata = zsdata->next();
       continue;
     }
 
