Skip to content

Commit 1e9fa78

Browse files
davidrohrnoferini
authored andcommitted
GPU TPC: Bugfix: was using cluster from one padRow to constain z in ShiftZ
1 parent 917f3c7 commit 1e9fa78

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

GPU/GPUTracking/SliceTracker/GPUTPCTrackletConstructor.cxx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,16 +393,18 @@ GPUdic(2, 1) void GPUTPCTrackletConstructor::UpdateTracklet(int /*nBlocks*/, int
393393
} while (0);
394394
}
395395
if (r.mNHits == 8 && r.mNMissed == 0 && rowHit != CALINK_INVAL && rowHit != CALINK_DEAD_CHANNEL && rowHits && tracker.Param().par.continuousTracking) {
396-
GPUglobalref() const cahit2* hits = tracker.HitData(row);
397396
const GPUglobalref() MEM_GLOBAL(GPUTPCRow) & GPUrestrict() row1 = tracker.Row(r.mFirstRow);
398397
const GPUglobalref() MEM_GLOBAL(GPUTPCRow) & GPUrestrict() row2 = tracker.Row(r.mLastRow);
399-
const cahit2 hh1 = CA_TEXTURE_FETCH(cahit2, gAliTexRefu2, hits, rowHits[r.mFirstRow]);
400-
const cahit2 hh2 = CA_TEXTURE_FETCH(cahit2, gAliTexRefu2, hits, rowHits[r.mLastRow]);
398+
GPUglobalref() const cahit2* hits1 = tracker.HitData(row1);
399+
GPUglobalref() const cahit2* hits2 = tracker.HitData(row2);
400+
const cahit2 hh1 = CA_TEXTURE_FETCH(cahit2, gAliTexRefu2, hits1, rowHits[r.mFirstRow]);
401+
const cahit2 hh2 = CA_TEXTURE_FETCH(cahit2, gAliTexRefu2, hits2, rowHits[r.mLastRow]);
401402
const float z1 = row1.Grid().ZMin() + hh1.y * row1.HstepZ();
402403
const float z2 = row2.Grid().ZMin() + hh2.y * row2.HstepZ();
403404
float oldOffset = tParam.ZOffset();
404405
tParam.ShiftZ(z1, z2, tracker.Param().tpcGeometry.Row2X(r.mFirstRow), tracker.Param().tpcGeometry.Row2X(r.mLastRow), tracker.Param().constBz, tracker.Param().rec.tpc.defaultZOffsetOverR);
405406
r.mLastZ -= tParam.ZOffset() - oldOffset;
407+
CADEBUG(printf("Shifted z from %f to %f\n", oldOffset, tParam.ZOffset()));
406408
}
407409
}
408410

0 commit comments

Comments
 (0)