fixed usage of GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME

matthias-kleiner · sawenzel · commit 709813ecf742 · 2019-08-07T15:12:17.000+02:00
diff --git a/GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx b/GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx
@@ -1182,7 +1182,7 @@ void GPUTPCGMMerger::CollectMergedTracks()
       cl[i].leg = clA[i].y;
 #ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME
       cl[i].pad = trackClusters[i].mPad;
-      cl[i].time = trackClusters[i].fTime;
+      cl[i].time = trackClusters[i].mTime;
 #endif
     }
 
diff --git a/GPU/GPUTracking/SliceTracker/GPUTPCTracker.cxx b/GPU/GPUTracking/SliceTracker/GPUTPCTracker.cxx
@@ -260,8 +260,8 @@ GPUh() void GPUTPCTracker::WriteOutput()
       GPUTPCSliceOutCluster c;
       c.Set(id, iRow, flags, amp, origX, origY, origZ);
 #ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME
-      c.pad = mData.ClusterData()[clusterIndex].pad;
-      c.time = mData.ClusterData()[clusterIndex].time;
+      c.mPad = mData.ClusterData()[clusterIndex].pad;
+      c.mTime = mData.ClusterData()[clusterIndex].time;
 #endif
       out->SetCluster(nClu, c);
       nClu++;
diff --git a/GPU/GPUTracking/TPCConvert/GPUTPCConvertKernel.cxx b/GPU/GPUTracking/TPCConvert/GPUTPCConvertKernel.cxx
@@ -49,6 +49,10 @@ GPUd() void GPUTPCConvertKernel::Thread<0>(int nBlocks, int nThreads, int iBlock
     cout.amp = cin.qMax;
     cout.flags = cin.getFlags();
     cout.id = idOffset + k;
+#ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME
+    cout.pad = cin.getPad();
+    cout.time = cin.getTime();
+#endif
   }
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1182,7 +1182,7 @@ void GPUTPCGMMerger::CollectMergedTracks()`
`1182`	`1182`	`cl[i].leg = clA[i].y;`
`1183`	`1183`	`#ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME`
`1184`	`1184`	`cl[i].pad = trackClusters[i].mPad;`
`1185`		`- cl[i].time = trackClusters[i].fTime;`
	`1185`	`+ cl[i].time = trackClusters[i].mTime;`
`1186`	`1186`	`#endif`
`1187`	`1187`	`}`
`1188`	`1188`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,10 @@ GPUd() void GPUTPCConvertKernel::Thread<0>(int nBlocks, int nThreads, int iBlock`
`49`	`49`	`cout.amp = cin.qMax;`
`50`	`50`	`cout.flags = cin.getFlags();`
`51`	`51`	`cout.id = idOffset + k;`
	`52`	`+#ifdef GPUCA_TPC_RAW_PROPAGATE_PAD_ROW_TIME`
	`53`	`+ cout.pad = cin.getPad();`
	`54`	`+ cout.time = cin.getTime();`
	`55`	`+#endif`
`52`	`56`	`}`
`53`	`57`	`}`
`54`	`58`	`#endif`