GPU: Simplify cluster decoding

davidrohr · davidrohr · commit 613ed9b86a72 · 2021-03-31T11:39:49.000+02:00
diff --git a/GPU/GPUTracking/DataCompression/TPCClusterDecompressor.cxx b/GPU/GPUTracking/DataCompression/TPCClusterDecompressor.cxx
@@ -38,12 +38,13 @@ int TPCClusterDecompressor::decompress(const CompressedClusters* clustersCompres
 {
   std::vector<ClusterNative> clusters[NSLICES][GPUCA_ROW_COUNT];
   unsigned int offset = 0;
-  float zOffset = 0;
   for (unsigned int i = 0; i < clustersCompressed->nTracks; i++) {
+    float zOffset = 0;
     unsigned int slice = clustersCompressed->sliceA[i];
     unsigned int row = clustersCompressed->rowA[i];
     GPUTPCCompressionTrackModel track;
-    for (unsigned int j = 0; j < clustersCompressed->nTrackClusters[i]; j++) {
+    unsigned int j;
+    for (j = 0; j < clustersCompressed->nTrackClusters[i]; j++) {
       unsigned int pad = 0, time = 0;
       if (j) {
         unsigned char tmpSlice = clustersCompressed->sliceLegDiffA[offset - i - 1];
@@ -65,11 +66,9 @@ int TPCClusterDecompressor::decompress(const CompressedClusters* clustersCompres
           row = clustersCompressed->rowDiffA[offset - i - 1];
         }
         if (changeLeg && track.Mirror()) {
-          offset += clustersCompressed->nTrackClusters[i] - j;
           break;
         }
         if (track.Propagate(param.tpcGeometry.Row2X(row), param.SliceParam[slice].Alpha)) {
-          offset += clustersCompressed->nTrackClusters[i] - j;
           break;
         }
         unsigned int timeTmp = clustersCompressed->timeResA[offset - i - 1];
@@ -92,11 +91,11 @@ int TPCClusterDecompressor::decompress(const CompressedClusters* clustersCompres
         track.Init(param.tpcGeometry.Row2X(row), y, z - zOffset, param.SliceParam[slice].Alpha, clustersCompressed->qPtA[i], param);
       }
       if (j + 1 < clustersCompressed->nTrackClusters[i] && track.Filter(y, z - zOffset, row)) {
-        offset += clustersCompressed->nTrackClusters[i] - j;
         break;
       }
       offset++;
     }
+    offset += clustersCompressed->nTrackClusters[i] - j;
   }
   ClusterNative* clusterBuffer = allocator(clustersCompressed->nAttachedClusters + clustersCompressed->nUnattachedClusters);
   unsigned int offsets[NSLICES][GPUCA_ROW_COUNT];

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,13 @@ int TPCClusterDecompressor::decompress(const CompressedClusters* clustersCompres`
`38`	`38`	`{`
`39`	`39`	`std::vector<ClusterNative> clusters[NSLICES][GPUCA_ROW_COUNT];`
`40`	`40`	`unsigned int offset = 0;`
`41`		`- float zOffset = 0;`
`42`	`41`	`for (unsigned int i = 0; i < clustersCompressed->nTracks; i++) {`
	`42`	`+ float zOffset = 0;`
`43`	`43`	`unsigned int slice = clustersCompressed->sliceA[i];`
`44`	`44`	`unsigned int row = clustersCompressed->rowA[i];`
`45`	`45`	`GPUTPCCompressionTrackModel track;`
`46`		`- for (unsigned int j = 0; j < clustersCompressed->nTrackClusters[i]; j++) {`
	`46`	`+ unsigned int j;`
	`47`	`+ for (j = 0; j < clustersCompressed->nTrackClusters[i]; j++) {`
`47`	`48`	`unsigned int pad = 0, time = 0;`
`48`	`49`	`if (j) {`
`49`	`50`	`unsigned char tmpSlice = clustersCompressed->sliceLegDiffA[offset - i - 1];`
`@@ -65,11 +66,9 @@ int TPCClusterDecompressor::decompress(const CompressedClusters* clustersCompres`
`65`	`66`	`row = clustersCompressed->rowDiffA[offset - i - 1];`
`66`	`67`	`}`
`67`	`68`	`if (changeLeg && track.Mirror()) {`
`68`		`- offset += clustersCompressed->nTrackClusters[i] - j;`
`69`	`69`	`break;`
`70`	`70`	`}`
`71`	`71`	`if (track.Propagate(param.tpcGeometry.Row2X(row), param.SliceParam[slice].Alpha)) {`
`72`		`- offset += clustersCompressed->nTrackClusters[i] - j;`
`73`	`72`	`break;`
`74`	`73`	`}`
`75`	`74`	`unsigned int timeTmp = clustersCompressed->timeResA[offset - i - 1];`
`@@ -92,11 +91,11 @@ int TPCClusterDecompressor::decompress(const CompressedClusters* clustersCompres`
`92`	`91`	`track.Init(param.tpcGeometry.Row2X(row), y, z - zOffset, param.SliceParam[slice].Alpha, clustersCompressed->qPtA[i], param);`
`93`	`92`	`}`
`94`	`93`	`if (j + 1 < clustersCompressed->nTrackClusters[i] && track.Filter(y, z - zOffset, row)) {`
`95`		`- offset += clustersCompressed->nTrackClusters[i] - j;`
`96`	`94`	`break;`
`97`	`95`	`}`
`98`	`96`	`offset++;`
`99`	`97`	`}`
	`98`	`+ offset += clustersCompressed->nTrackClusters[i] - j;`
`100`	`99`	`}`
`101`	`100`	`ClusterNative* clusterBuffer = allocator(clustersCompressed->nAttachedClusters + clustersCompressed->nUnattachedClusters);`
`102`	`101`	`unsigned int offsets[NSLICES][GPUCA_ROW_COUNT];`