GPU TPC: Constrain time window to compute deltaFwd / deltaBwd to the TPC drift time

davidrohr · davidrohr · commit 49736e18fa8f · 2023-01-20T11:00:42.000+01:00
diff --git a/GPU/GPUTracking/Merger/GPUTPCGMO2Output.cxx b/GPU/GPUTracking/Merger/GPUTPCGMO2Output.cxx
@@ -166,8 +166,7 @@ GPUdii() void GPUTPCGMO2Output::Thread<GPUTPCGMO2Output::output>(int nBlocks, in
         t1 = clusters->clustersLinear[clusterIdGlobal].getTime();
         sector1 = sector;
       }
-      nOutCl2++;
-      if (nOutCl2 == nOutCl) {
+      if (++nOutCl2 == nOutCl) {
         t2 = clusters->clustersLinear[clusterIdGlobal].getTime();
         sector2 = sector;
       }
@@ -196,10 +195,11 @@ GPUdii() void GPUTPCGMO2Output::Thread<GPUTPCGMO2Output::output>(int nBlocks, in
         tFwd = tBwd = delta;
       } else {
         // estimate max/min time increments which still keep track in the physical limits of the TPC
-        float tmin = CAMath::Min(t1, t2);
-        float tmax = CAMath::Max(t1, t2);
+        const float tmin = CAMath::Min(t1, t2);
+        const float maxDriftTime = merger.GetConstantMem()->calibObjects.fastTransformHelper->getCorrMap()->getMaxDriftTime(t1 > t2 ? sector1 : sector2);
+        const float tmax = CAMath::Min(tmin + maxDriftTime, CAMath::Max(t1, t2));
         tFwd = tmin - time0;
-        tBwd = time0 - tmax + merger.GetConstantMem()->calibObjects.fastTransformHelper->getCorrMap()->getMaxDriftTime(t1 > t2 ? sector1 : sector2);
+        tBwd = time0 - tmax + maxDriftTime;
       }
     }
     oTrack.setTime0(time0);

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,7 @@ GPUdii() void GPUTPCGMO2Output::Thread<GPUTPCGMO2Output::output>(int nBlocks, in`
`166`	`166`	`t1 = clusters->clustersLinear[clusterIdGlobal].getTime();`
`167`	`167`	`sector1 = sector;`
`168`	`168`	`}`
`169`		`- nOutCl2++;`
`170`		`- if (nOutCl2 == nOutCl) {`
	`169`	`+ if (++nOutCl2 == nOutCl) {`
`171`	`170`	`t2 = clusters->clustersLinear[clusterIdGlobal].getTime();`
`172`	`171`	`sector2 = sector;`
`173`	`172`	`}`
`@@ -196,10 +195,11 @@ GPUdii() void GPUTPCGMO2Output::Thread<GPUTPCGMO2Output::output>(int nBlocks, in`
`196`	`195`	`tFwd = tBwd = delta;`
`197`	`196`	`} else {`
`198`	`197`	`// estimate max/min time increments which still keep track in the physical limits of the TPC`
`199`		`- float tmin = CAMath::Min(t1, t2);`
`200`		`- float tmax = CAMath::Max(t1, t2);`
	`198`	`+ const float tmin = CAMath::Min(t1, t2);`
	`199`	`+ const float maxDriftTime = merger.GetConstantMem()->calibObjects.fastTransformHelper->getCorrMap()->getMaxDriftTime(t1 > t2 ? sector1 : sector2);`
	`200`	`+ const float tmax = CAMath::Min(tmin + maxDriftTime, CAMath::Max(t1, t2));`
`201`	`201`	`tFwd = tmin - time0;`
`202`		`- tBwd = time0 - tmax + merger.GetConstantMem()->calibObjects.fastTransformHelper->getCorrMap()->getMaxDriftTime(t1 > t2 ? sector1 : sector2);`
	`202`	`+ tBwd = time0 - tmax + maxDriftTime;`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`	`oTrack.setTime0(time0);`