TPC Clusterization: Check ZS data format version

davidrohr · davidrohr · commit c4d120c959c6 · 2022-04-17T10:36:23.000+02:00
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/ZeroSuppression.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/ZeroSuppression.h
@@ -33,7 +33,10 @@ struct TPCZSHDR {
   static constexpr unsigned int TPC_ZS_NBITS_V1 = 10;
   static constexpr unsigned int TPC_ZS_NBITS_V2 = 12;
 
-  unsigned char version;
+  unsigned char version; // ZS format version:
+                         // 1: original row-based format with 10-bit ADC values
+                         // 2: original row-based format with 12-bit ADC values
+                         // 3: improved link-based format with extra META header
   unsigned char nTimeBins;
   unsigned short cruID;
   unsigned short timeOffset;
diff --git a/GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx b/GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx
@@ -130,6 +130,7 @@ std::pair<unsigned int, unsigned int> GPUChainTracking::TPCClusterizerDecodeZSCo
           continue;
         }
         const TPCZSHDR* const hdr = (const TPCZSHDR*)(page + sizeof(o2::header::RAWDataHeader));
+        mCFContext->zsVersion = hdr->version;
         nDigits += hdr->nADCsamples;
         unsigned int timeBin = (hdr->timeOffset + (o2::raw::RDHUtils::getHeartBeatOrbit(*rdh) - firstHBF) * o2::constants::lhc::LHCMaxBunches) / LHCBCPERTIMEBIN;
         if (timeBin + hdr->nTimeBins > mCFContext->tpcMaxTimeBin) {
@@ -524,7 +525,11 @@ int GPUChainTracking::RunTPCClusterizer(bool synchronizeOutput)
 
         if (mIOPtrs.tpcZS) {
           int firstHBF = (mIOPtrs.settingsTF && mIOPtrs.settingsTF->hasTfStartOrbit) ? mIOPtrs.settingsTF->tfStartOrbit : (mIOPtrs.tpcZS->slice[iSlice].count[0] && mIOPtrs.tpcZS->slice[iSlice].nZSPtr[0][0]) ? o2::raw::RDHUtils::getHeartBeatOrbit(*(const o2::header::RAWDataHeader*)mIOPtrs.tpcZS->slice[iSlice].zsPtr[0][0]) : 0;
-          runKernel<GPUTPCCFDecodeZS, GPUTPCCFDecodeZS::decodeZS>(GetGridBlk(doGPU ? clusterer.mPmemory->counters.nPagesSubslice : GPUTrackingInOutZS::NENDPOINTS, lane), {iSlice}, {}, firstHBF);
+          if (mCFContext->zsVersion >= 1 || mCFContext->zsVersion <= 2) {
+            runKernel<GPUTPCCFDecodeZS, GPUTPCCFDecodeZS::decodeZS>(GetGridBlk(doGPU ? clusterer.mPmemory->counters.nPagesSubslice : GPUTrackingInOutZS::NENDPOINTS, lane), {iSlice}, {}, firstHBF);
+          } else {
+            GPUFatal("Data with invalid TPC ZS mode received");
+          }
           TransferMemoryResourceLinkToHost(RecoStep::TPCClusterFinding, clusterer.mMemoryId, lane);
         }
       }
diff --git a/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFChainContext.h b/GPU/GPUTracking/TPCClusterFinder/GPUTPCCFChainContext.h
@@ -41,6 +41,7 @@ struct GPUTPCCFChainContext {
     unsigned char* zsDevice;
   };
 
+  unsigned int zsVersion;
   std::vector<FragmentData> fragmentData;
   unsigned int nPagesTotal;
   unsigned int nPagesSectorMax;

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ std::pair<unsigned int, unsigned int> GPUChainTracking::TPCClusterizerDecodeZSCo`
`130`	`130`	`continue;`
`131`	`131`	`}`
`132`	`132`	`const TPCZSHDR* const hdr = (const TPCZSHDR*)(page + sizeof(o2::header::RAWDataHeader));`
	`133`	`+ mCFContext->zsVersion = hdr->version;`
`133`	`134`	`nDigits += hdr->nADCsamples;`
`134`	`135`	`unsigned int timeBin = (hdr->timeOffset + (o2::raw::RDHUtils::getHeartBeatOrbit(rdh) - firstHBF) o2::constants::lhc::LHCMaxBunches) / LHCBCPERTIMEBIN;`
`135`	`136`	`if (timeBin + hdr->nTimeBins > mCFContext->tpcMaxTimeBin) {`
`@@ -524,7 +525,11 @@ int GPUChainTracking::RunTPCClusterizer(bool synchronizeOutput)`
`524`	`525`
`525`	`526`	`if (mIOPtrs.tpcZS) {`
`526`	`527`	`int firstHBF = (mIOPtrs.settingsTF && mIOPtrs.settingsTF->hasTfStartOrbit) ? mIOPtrs.settingsTF->tfStartOrbit : (mIOPtrs.tpcZS->slice[iSlice].count[0] && mIOPtrs.tpcZS->slice[iSlice].nZSPtr[0][0]) ? o2::raw::RDHUtils::getHeartBeatOrbit((const o2::header::RAWDataHeader)mIOPtrs.tpcZS->slice[iSlice].zsPtr[0][0]) : 0;`
`527`		`- runKernel<GPUTPCCFDecodeZS, GPUTPCCFDecodeZS::decodeZS>(GetGridBlk(doGPU ? clusterer.mPmemory->counters.nPagesSubslice : GPUTrackingInOutZS::NENDPOINTS, lane), {iSlice}, {}, firstHBF);`
	`528`	`+ if (mCFContext->zsVersion >= 1 \|\| mCFContext->zsVersion <= 2) {`
	`529`	`+ runKernel<GPUTPCCFDecodeZS, GPUTPCCFDecodeZS::decodeZS>(GetGridBlk(doGPU ? clusterer.mPmemory->counters.nPagesSubslice : GPUTrackingInOutZS::NENDPOINTS, lane), {iSlice}, {}, firstHBF);`
	`530`	`+ } else {`
	`531`	`+ GPUFatal("Data with invalid TPC ZS mode received");`
	`532`	`+ }`
`528`	`533`	`TransferMemoryResourceLinkToHost(RecoStep::TPCClusterFinding, clusterer.mMemoryId, lane);`
`529`	`534`	`}`
`530`	`535`	`}`