TPC: Adjust magic word in ILBZS meta header, update GPU decoder

wiechula · davidrohr · commit d27b83f67f2f · 2022-07-10T12:51:59.000+02:00
* reflect the fixed ILBZS magic word in hardware
* add missing cruid in GPU decoder, which is required by TPC calibration
  code
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/ZeroSuppressionLinkBased.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/ZeroSuppressionLinkBased.h
@@ -36,8 +36,7 @@ static constexpr uint32_t ChannelPerTBHeader = 80;
 /// common header definition of the zero suppressed link based data
 struct CommonHeader {
   static constexpr uint32_t MagicWordLinkZS = 0xFC;
-  // static constexpr uint32_t MagicWordLinkZSMetaHeader = 0xFD;
-  static constexpr uint32_t MagicWordLinkZSMetaHeader = 0xDF;
+  static constexpr uint32_t MagicWordLinkZSMetaHeader = 0xFD;
   static constexpr uint32_t MagicWordTrigger = 0xAA;
   static constexpr uint32_t MagicWordTriggerV2 = 0xAB;
 
diff --git a/Detectors/TPC/reconstruction/src/RawProcessingHelpers.cxx b/Detectors/TPC/reconstruction/src/RawProcessingHelpers.cxx
@@ -41,7 +41,7 @@ bool raw_processing_helpers::processZSdata(const char* data, size_t size, rdh_ut
   static std::array<uint32_t, 360 * 24> syncOffsetLinks;
 
   const uint32_t maxBunches = (uint32_t)o2::constants::lhc::LHCMaxBunches;
-  int globalBCOffset = int(orbit - referenceOrbit) * o2::constants::lhc::LHCMaxBunches;
+  const int globalBCOffset = int(orbit - referenceOrbit) * o2::constants::lhc::LHCMaxBunches;
   static int triggerBCOffset = 0;
 
   bool hasData{false};
diff --git a/GPU/GPUTracking/Base/GPUReconstructionConvert.cxx b/GPU/GPUTracking/Base/GPUReconstructionConvert.cxx
@@ -446,7 +446,7 @@ void zsEncoderRow::decodePage(std::vector<o2::tpc::Digit>& outputBuffer, const z
       for (int n = 0; n < nSeqRead; n++) {
         const int decSeqLen = rowData[(n + 1) * 2] - (n ? rowData[n * 2] : 0);
         for (int o = 0; o < decSeqLen; o++) {
-          outputBuffer.emplace_back(o2::tpc::Digit{0, decBuffer[posXbits++] * decodeBitsFactor, (tpccf::Row)(rowOffset + m), (tpccf::Pad)(rowData[n * 2 + 1] + o), timeBin + l});
+          outputBuffer.emplace_back(o2::tpc::Digit{cruid, decBuffer[posXbits++] * decodeBitsFactor, (tpccf::Row)(rowOffset + m), (tpccf::Pad)(rowData[n * 2 + 1] + o), timeBin + l});
         }
       }
       rowPos++;
@@ -664,7 +664,7 @@ void zsEncoderImprovedLinkBased::decodePage(std::vector<o2::tpc::Digit>& outputB
     o2::tpc::CRU cru = cruid % 10;
     const int feeLink = tbHdr->fecInPartition - (decEndpoint & 1) * ((mapper.getPartitionInfo(cru.partition()).getNumberOfFECs() + 1) / 2);
     auto fillADC = [&outputBuffer](int cru, int rowInSector, int padInRow, int timeBin, float adcValue) {
-      outputBuffer.emplace_back(o2::tpc::Digit{0, adcValue, rowInSector, padInRow, timeBin});
+      outputBuffer.emplace_back(o2::tpc::Digit{cruid, adcValue, rowInSector, padInRow, timeBin});
       return true;
     };
     size_t size = sizeof(*tbHdr) + tbHdr->numWordsPayload * 16;
@@ -701,7 +701,7 @@ void zsEncoderImprovedLinkBased::decodePage(std::vector<o2::tpc::Digit>& outputB
         mapper.getSampaAndChannelOnFEC(cruid, j, sampaOnFEC, channelOnSAMPA);
         const auto padSecPos = mapper.padSecPos(cruid, tbHdr->fecInPartition, sampaOnFEC, channelOnSAMPA);
         const auto& padPos = padSecPos.getPadPos();
-        outputBuffer.emplace_back(o2::tpc::Digit{0, decBuffer[k++] * decodeBitsFactor, (tpccf::Row)padPos.getRow(), (tpccf::Pad)padPos.getPad(), timeBin});
+        outputBuffer.emplace_back(o2::tpc::Digit{cruid, decBuffer[k++] * decodeBitsFactor, (tpccf::Row)padPos.getRow(), (tpccf::Pad)padPos.getPad(), timeBin});
       }
     }
 #endif
@@ -878,7 +878,7 @@ void zsEncoderDenseLinkBased::decodePage(std::vector<o2::tpc::Digit>& outputBuff
           mapper.getSampaAndChannelOnFEC(cruid, j, sampaOnFEC, channelOnSAMPA);
           const auto padSecPos = mapper.padSecPos(cruid, decLink, sampaOnFEC, channelOnSAMPA);
           const auto& padPos = padSecPos.getPadPos();
-          outputBuffer.emplace_back(o2::tpc::Digit{0, decBuffer[k++] * decodeBitsFactor, (tpccf::Row)padPos.getRow(), (tpccf::Pad)padPos.getPad(), timeBin});
+          outputBuffer.emplace_back(o2::tpc::Digit{cruid, decBuffer[k++] * decodeBitsFactor, (tpccf::Row)padPos.getRow(), (tpccf::Pad)padPos.getPad(), timeBin});
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ void zsEncoderRow::decodePage(std::vector<o2::tpc::Digit>& outputBuffer, const z`
`446`	`446`	`for (int n = 0; n < nSeqRead; n++) {`
`447`	`447`	`const int decSeqLen = rowData[(n + 1) * 2] - (n ? rowData[n * 2] : 0);`
`448`	`448`	`for (int o = 0; o < decSeqLen; o++) {`
`449`		`- outputBuffer.emplace_back(o2::tpc::Digit{0, decBuffer[posXbits++] * decodeBitsFactor, (tpccf::Row)(rowOffset + m), (tpccf::Pad)(rowData[n * 2 + 1] + o), timeBin + l});`
	`449`	`+ outputBuffer.emplace_back(o2::tpc::Digit{cruid, decBuffer[posXbits++] * decodeBitsFactor, (tpccf::Row)(rowOffset + m), (tpccf::Pad)(rowData[n * 2 + 1] + o), timeBin + l});`
`450`	`450`	`}`
`451`	`451`	`}`
`452`	`452`	`rowPos++;`
`@@ -664,7 +664,7 @@ void zsEncoderImprovedLinkBased::decodePage(std::vector<o2::tpc::Digit>& outputB`
`664`	`664`	`o2::tpc::CRU cru = cruid % 10;`
`665`	`665`	`const int feeLink = tbHdr->fecInPartition - (decEndpoint & 1) * ((mapper.getPartitionInfo(cru.partition()).getNumberOfFECs() + 1) / 2);`
`666`	`666`	`auto fillADC = [&outputBuffer](int cru, int rowInSector, int padInRow, int timeBin, float adcValue) {`
`667`		`- outputBuffer.emplace_back(o2::tpc::Digit{0, adcValue, rowInSector, padInRow, timeBin});`
	`667`	`+ outputBuffer.emplace_back(o2::tpc::Digit{cruid, adcValue, rowInSector, padInRow, timeBin});`
`668`	`668`	`return true;`
`669`	`669`	`};`
`670`	`670`	`size_t size = sizeof(tbHdr) + tbHdr->numWordsPayload 16;`
`@@ -701,7 +701,7 @@ void zsEncoderImprovedLinkBased::decodePage(std::vector<o2::tpc::Digit>& outputB`
`701`	`701`	`mapper.getSampaAndChannelOnFEC(cruid, j, sampaOnFEC, channelOnSAMPA);`
`702`	`702`	`const auto padSecPos = mapper.padSecPos(cruid, tbHdr->fecInPartition, sampaOnFEC, channelOnSAMPA);`
`703`	`703`	`const auto& padPos = padSecPos.getPadPos();`
`704`		`- outputBuffer.emplace_back(o2::tpc::Digit{0, decBuffer[k++] * decodeBitsFactor, (tpccf::Row)padPos.getRow(), (tpccf::Pad)padPos.getPad(), timeBin});`
	`704`	`+ outputBuffer.emplace_back(o2::tpc::Digit{cruid, decBuffer[k++] * decodeBitsFactor, (tpccf::Row)padPos.getRow(), (tpccf::Pad)padPos.getPad(), timeBin});`
`705`	`705`	`}`
`706`	`706`	`}`
`707`	`707`	`#endif`
`@@ -878,7 +878,7 @@ void zsEncoderDenseLinkBased::decodePage(std::vector<o2::tpc::Digit>& outputBuff`
`878`	`878`	`mapper.getSampaAndChannelOnFEC(cruid, j, sampaOnFEC, channelOnSAMPA);`
`879`	`879`	`const auto padSecPos = mapper.padSecPos(cruid, decLink, sampaOnFEC, channelOnSAMPA);`
`880`	`880`	`const auto& padPos = padSecPos.getPadPos();`
`881`		`- outputBuffer.emplace_back(o2::tpc::Digit{0, decBuffer[k++] * decodeBitsFactor, (tpccf::Row)padPos.getRow(), (tpccf::Pad)padPos.getPad(), timeBin});`
	`881`	`+ outputBuffer.emplace_back(o2::tpc::Digit{cruid, decBuffer[k++] * decodeBitsFactor, (tpccf::Row)padPos.getRow(), (tpccf::Pad)padPos.getPad(), timeBin});`
`882`	`882`	`}`
`883`	`883`	`}`
`884`	`884`	`}`