GPU TPC: Fix constraining of TPC track time0

davidrohr · davidrohr · commit 002dacc8f607 · 2023-01-20T11:00:42.000+01:00
diff --git a/GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx b/GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx
@@ -940,9 +940,9 @@ GPUd() void GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMerger* GPUrestrict() merge
     } else if (zMax > 0 && zMax - mTZOffset > 250) {
       deltaZ = zMax - mTZOffset - 250;
     }
-    if (zMin < 0 && zMax - mTZOffset > 0) {
+    if (zMin < 0 && zMax - (mTZOffset + deltaZ) > 0) {
       deltaZ = zMax - mTZOffset;
-    } else if (zMax > 0 && zMin - mTZOffset < 0) {
+    } else if (zMax > 0 && zMin - (mTZOffset + deltaZ) < 0) {
       deltaZ = zMin - mTZOffset;
     }
     // if (deltaZ != 0) printf("Moving clusters to TPC Range: Shift %f in Z: %f to %f --> %f to %f in Z\n", deltaZ, tz2 - mTZOffset, tz1 - mTZOffset, tz2 - mTZOffset - deltaZ, tz1 - mTZOffset - deltaZ);
@@ -959,7 +959,7 @@ GPUd() void GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMerger* GPUrestrict() merge
     if (mTZOffset < minT) {
       deltaT = minT - mTZOffset;
     }
-    if (mTZOffset > maxT) {
+    if (mTZOffset + deltaT > maxT) {
       deltaT = maxT - mTZOffset;
     }
     if (deltaT != 0.f) {

Original file line number	Diff line number	Diff line change
`@@ -940,9 +940,9 @@ GPUd() void GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMerger* GPUrestrict() merge`
`940`	`940`	`} else if (zMax > 0 && zMax - mTZOffset > 250) {`
`941`	`941`	`deltaZ = zMax - mTZOffset - 250;`
`942`	`942`	`}`
`943`		`- if (zMin < 0 && zMax - mTZOffset > 0) {`
	`943`	`+ if (zMin < 0 && zMax - (mTZOffset + deltaZ) > 0) {`
`944`	`944`	`deltaZ = zMax - mTZOffset;`
`945`		`- } else if (zMax > 0 && zMin - mTZOffset < 0) {`
	`945`	`+ } else if (zMax > 0 && zMin - (mTZOffset + deltaZ) < 0) {`
`946`	`946`	`deltaZ = zMin - mTZOffset;`
`947`	`947`	`}`
`948`	`948`	`// if (deltaZ != 0) printf("Moving clusters to TPC Range: Shift %f in Z: %f to %f --> %f to %f in Z\n", deltaZ, tz2 - mTZOffset, tz1 - mTZOffset, tz2 - mTZOffset - deltaZ, tz1 - mTZOffset - deltaZ);`
`@@ -959,7 +959,7 @@ GPUd() void GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMerger* GPUrestrict() merge`
`959`	`959`	`if (mTZOffset < minT) {`
`960`	`960`	`deltaT = minT - mTZOffset;`
`961`	`961`	`}`
`962`		`- if (mTZOffset > maxT) {`
	`962`	`+ if (mTZOffset + deltaT > maxT) {`
`963`	`963`	`deltaT = maxT - mTZOffset;`
`964`	`964`	`}`
`965`	`965`	`if (deltaT != 0.f) {`