Skip to content

Commit 5dd5e05

Browse files
committed
GPUTracking: rename the cluster finder's fragment to frag
fragment is a reserved word in MSL, where it qualifies a shader stage, so it cannot name a member, a parameter or a local. The cluster finder used it for all three, which was 38 of the errors left in the Metal compile. Purely a rename, in code positions only: the option descriptions in GPUSettingsList.h that mention fragments are strings and are untouched, as are the comments.
1 parent c584edc commit 5dd5e05

10 files changed

Lines changed: 100 additions & 100 deletions

‎GPU/GPUTracking/Global/GPUChainTracking.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ class GPUChainTracking : public GPUChain
300300
int32_t RunTPCTrackingSectors_internal();
301301
int32_t RunTPCClusterizer_prepare(bool restorePointers, const GPUTPCExtraADC& extraADCs);
302302
#ifndef GPUCA_RUN2
303-
std::pair<uint32_t, uint32_t> RunTPCClusterizer_transferZS(int32_t iSector, const CfFragment& fragment, int32_t lane, const GPUTPCExtraADC& extraADCs);
303+
std::pair<uint32_t, uint32_t> RunTPCClusterizer_transferZS(int32_t iSector, const CfFragment& frag, int32_t lane, const GPUTPCExtraADC& extraADCs);
304304
void RunTPCClusterizer_compactPeaks(GPUTPCClusterFinder& clusterer, GPUTPCClusterFinder& clustererShadow, int32_t stage, bool doGPU, int32_t lane);
305-
std::pair<uint32_t, uint32_t> TPCClusterizerDecodeZSCount(uint32_t iSector, const CfFragment& fragment);
306-
std::pair<uint32_t, uint32_t> TPCClusterizerDecodeZSCountUpdate(uint32_t iSector, const CfFragment& fragment);
307-
void TPCClusterizerEnsureZSOffsets(uint32_t iSector, const CfFragment& fragment);
305+
std::pair<uint32_t, uint32_t> TPCClusterizerDecodeZSCount(uint32_t iSector, const CfFragment& frag);
306+
std::pair<uint32_t, uint32_t> TPCClusterizerDecodeZSCountUpdate(uint32_t iSector, const CfFragment& frag);
307+
void TPCClusterizerEnsureZSOffsets(uint32_t iSector, const CfFragment& frag);
308308
void TPCClusterizerTransferExtraADC(GPUTPCClusterFinder& clusterer, GPUTPCClusterFinder& clustererShadow, int lane, const GPUTPCExtraADC& extraADCs);
309309
void TPCClusterizerCheckExtraADCZeros(GPUTPCClusterFinder& clusterer, GPUTPCClusterFinder& clustererShadow, int lane, const GPUTPCExtraADC& extraADCs);
310310
#endif

‎GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx‎

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

‎GPU/GPUTracking/TPCClusterFinder/GPUTPCCFChargeMapFiller.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ template <>
2424
GPUdii() void GPUTPCCFChargeMapFiller::Thread<GPUTPCCFChargeMapFiller::fillIndexMap>(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUSharedMemory& smem, processorType& clusterer)
2525
{
2626
CfArray2D<uint32_t> indexMap(clusterer.mPindexMap);
27-
fillIndexMapImpl(get_num_groups(0), get_local_size(0), get_group_id(0), get_local_id(0), clusterer.mPmemory->fragment, clusterer.mPdigits, indexMap, clusterer.mPmemory->counters.nDigitsInFragment);
27+
fillIndexMapImpl(get_num_groups(0), get_local_size(0), get_group_id(0), get_local_id(0), clusterer.mPmemory->frag, clusterer.mPdigits, indexMap, clusterer.mPmemory->counters.nDigitsInFragment);
2828
}
2929

3030
GPUd() void GPUTPCCFChargeMapFiller::fillIndexMapImpl(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread,
31-
const CfFragment& fragment,
31+
const CfFragment& frag,
3232
const tpc::Digit* digits,
3333
CfArray2D<uint32_t>& indexMap,
3434
size_t maxDigit)
@@ -37,20 +37,20 @@ GPUd() void GPUTPCCFChargeMapFiller::fillIndexMapImpl(int32_t nBlocks, int32_t n
3737
if (idx >= maxDigit) {
3838
return;
3939
}
40-
CPU_ONLY(idx += fragment.digitsStart);
40+
CPU_ONLY(idx += frag.digitsStart);
4141
CPU_ONLY(tpc::Digit digit = digits[idx]);
42-
CPU_ONLY(CfChargePos pos(digit.getRow(), digit.getPad(), fragment.toLocal(digit.getTimeStamp())));
42+
CPU_ONLY(CfChargePos pos(digit.getRow(), digit.getPad(), frag.toLocal(digit.getTimeStamp())));
4343
CPU_ONLY(indexMap.safeWrite(pos, idx));
4444
}
4545

4646
template <>
4747
GPUdii() void GPUTPCCFChargeMapFiller::Thread<GPUTPCCFChargeMapFiller::fillFromDigits>(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUSharedMemory& smem, processorType& clusterer)
4848
{
4949
CfArray2D<PackedCharge> chargeMap(reinterpret_cast<PackedCharge*>(clusterer.mPchargeMap));
50-
fillFromDigitsImpl(get_num_groups(0), get_local_size(0), get_group_id(0), get_local_id(0), clusterer, clusterer.mPmemory->fragment, clusterer.mPmemory->counters.nPositions, clusterer.mPdigits, clusterer.mPpositions, chargeMap);
50+
fillFromDigitsImpl(get_num_groups(0), get_local_size(0), get_group_id(0), get_local_id(0), clusterer, clusterer.mPmemory->frag, clusterer.mPmemory->counters.nPositions, clusterer.mPdigits, clusterer.mPpositions, chargeMap);
5151
}
5252

53-
GPUd() void GPUTPCCFChargeMapFiller::fillFromDigitsImpl(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, processorType& clusterer, const CfFragment& fragment, size_t digitNum,
53+
GPUd() void GPUTPCCFChargeMapFiller::fillFromDigitsImpl(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, processorType& clusterer, const CfFragment& frag, size_t digitNum,
5454
const tpc::Digit* digits,
5555
CfChargePos* positions,
5656
CfArray2D<PackedCharge>& chargeMap)
@@ -59,9 +59,9 @@ GPUd() void GPUTPCCFChargeMapFiller::fillFromDigitsImpl(int32_t nBlocks, int32_t
5959
if (idx >= digitNum) {
6060
return;
6161
}
62-
tpc::Digit digit = digits[fragment.digitsStart + idx];
62+
tpc::Digit digit = digits[frag.digitsStart + idx];
6363

64-
CfChargePos pos(digit.getRow(), digit.getPad(), fragment.toLocal(digit.getTimeStamp()));
64+
CfChargePos pos(digit.getRow(), digit.getPad(), frag.toLocal(digit.getTimeStamp()));
6565
positions[idx] = pos;
6666
float q = digit.getChargeFloat();
6767
q *= clusterer.GetConstantMem()->calibObjects.tpcPadGain->getGainCorrection(clusterer.mISector, digit.getRow(), digit.getPad());
@@ -77,10 +77,10 @@ GPUdii() void GPUTPCCFChargeMapFiller::Thread<GPUTPCCFChargeMapFiller::findFragm
7777

7878
size_t nDigits = clusterer.mPmemory->counters.nDigits;
7979
const tpc::Digit* digits = clusterer.mPdigits;
80-
size_t st = findTransition(clusterer.mPmemory->fragment.first(), digits, nDigits, 0);
81-
size_t end = findTransition(clusterer.mPmemory->fragment.last(), digits, nDigits, st);
80+
size_t st = findTransition(clusterer.mPmemory->frag.first(), digits, nDigits, 0);
81+
size_t end = findTransition(clusterer.mPmemory->frag.last(), digits, nDigits, st);
8282

83-
clusterer.mPmemory->fragment.digitsStart = st;
83+
clusterer.mPmemory->frag.digitsStart = st;
8484

8585
size_t elems = end - st;
8686

‎GPU/GPUTracking/TPCClusterFinder/GPUTPCCFCheckPadBaseline.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ GPUd() void GPUTPCCFCheckPadBaseline::CheckBaselineGPU(int32_t nBlocks, int32_t
236236
return;
237237
}
238238

239-
const CfFragment& fragment = clusterer.mPmemory->fragment;
239+
const CfFragment& frag = clusterer.mPmemory->frag;
240240
const bool hipFilterOn = clusterer.Param().rec.tpc.hipTailFilter;
241241
const Charge hipTailThreshold = clusterer.Param().rec.tpc.hipTailFilterThreshold;
242242
const Charge hipTailFilterAlpha = clusterer.Param().rec.tpc.hipTailFilterAlpha;
@@ -265,7 +265,7 @@ GPUd() void GPUTPCCFCheckPadBaseline::CheckBaselineGPU(int32_t nBlocks, int32_t
265265
// saturated signal in overlap region can create tails in the next fragment
266266
// even when cleared in current fragment as they're decoded twice
267267
const TPCFragmentTime firstTB = 0;
268-
const TPCFragmentTime lastTB = fragment.length;
268+
const TPCFragmentTime lastTB = frag.length;
269269

270270
for (uint16_t t = firstTB; t < lastTB; t += NumOfCachedTBs) {
271271

@@ -418,7 +418,7 @@ GPUd() void GPUTPCCFCheckPadBaseline::CheckBaselineCPU(int32_t nBlocks, int32_t
418418
const int32_t nPads = geo.NPads(row);
419419
const int32_t nVecPads = (nPads + PadsPerCacheline - 1) / PadsPerCacheline;
420420

421-
const CfFragment& fragment = clusterer.mPmemory->fragment;
421+
const CfFragment& frag = clusterer.mPmemory->frag;
422422
const bool hipFilterOn = clusterer.Param().rec.tpc.hipTailFilter;
423423
const Charge hipTailThreshold = clusterer.Param().rec.tpc.hipTailFilterThreshold;
424424
const Charge hipTailFilterAlpha = clusterer.Param().rec.tpc.hipTailFilterAlpha;
@@ -449,7 +449,7 @@ GPUd() void GPUTPCCFCheckPadBaseline::CheckBaselineCPU(int32_t nBlocks, int32_t
449449
std::vector<Short8> activeHIPTailSatEndV(nVecPads, -1); // end of that plateau, extended while the plateau continues into later chunks
450450
std::vector<Charge8> tailFilterChargeV(nVecPads, Charge8{Vc::Zero});
451451

452-
for (int16_t t = 0; t < fragment.length; t += NumOfCachedTBs) {
452+
for (int16_t t = 0; t < frag.length; t += NumOfCachedTBs) {
453453

454454
bool hasAnyTrigger = false;
455455

@@ -478,7 +478,7 @@ GPUd() void GPUTPCCFCheckPadBaseline::CheckBaselineCPU(int32_t nBlocks, int32_t
478478
for (tpccf::TPCFragmentTime localtime = 0; localtime < NumOfCachedTBs; localtime++) {
479479

480480
const uint16_t* packedChargeStart = reinterpret_cast<uint16_t*>(&chargeMap[basePos.delta({0, localtime})]);
481-
const UShort8 packedCharges = t + localtime < fragment.length
481+
const UShort8 packedCharges = t + localtime < frag.length
482482
? UShort8{packedChargeStart, Vc::Aligned}
483483
: UShort8{Vc::Zero};
484484
const auto isCharge = packedCharges != 0;
@@ -661,7 +661,7 @@ GPUd() void GPUTPCCFCheckPadBaseline::CheckBaselineCPU(int32_t nBlocks, int32_t
661661
tailFilterChargeV[iVecPad] = tailFilterCharge;
662662

663663
} // for (int32_t iVecPad = 0; iVecPad < nVecPads; iVecPad++)
664-
} // for (auto t = 0; t < fragment.length; t += TimebinsPerCacheline)
664+
} // for (auto t = 0; t < frag.length; t += TimebinsPerCacheline)
665665

666666
// Close old tails for all pads, open new tails in case of overlap
667667
for (int16_t iVecPad = 0; iVecPad < nVecPads; iVecPad++) {
@@ -672,7 +672,7 @@ GPUd() void GPUTPCCFCheckPadBaseline::CheckBaselineCPU(int32_t nBlocks, int32_t
672672
const auto activeHIPTailSatEnd = activeHIPTailSatEndV[iVecPad];
673673

674674
const auto shouldCloseTail = activeHIPTailStart > -1;
675-
activeHIPTailEnd(shouldCloseTail && activeHIPTailEnd < 0) = fragment.length;
675+
activeHIPTailEnd(shouldCloseTail && activeHIPTailEnd < 0) = frag.length;
676676

677677
if (hipFilterOn && shouldCloseTail.isNotEmpty()) {
678678
for (int16_t p = 0; p < PadsPerCacheline; p++) {
@@ -728,8 +728,8 @@ GPUd() void GPUTPCCFCheckPadBaseline::CheckBaselineCPU(int32_t nBlocks, int32_t
728728

729729
GPUd() void GPUTPCCFCheckPadBaseline::updatePadBaseline(int32_t pad, const GPUTPCClusterFinder& clusterer, int32_t totalCharges, int32_t consecCharges, Charge maxCharge)
730730
{
731-
const CfFragment& fragment = clusterer.mPmemory->fragment;
732-
const int32_t totalChargesBaseline = clusterer.Param().rec.tpc.maxTimeBinAboveThresholdIn1000Bin * fragment.lengthWithoutOverlap() / 1000;
731+
const CfFragment& frag = clusterer.mPmemory->frag;
732+
const int32_t totalChargesBaseline = clusterer.Param().rec.tpc.maxTimeBinAboveThresholdIn1000Bin * frag.lengthWithoutOverlap() / 1000;
733733
const int32_t consecChargesBaseline = clusterer.Param().rec.tpc.maxConsecTimeBinAboveThreshold;
734734
const uint16_t saturationThreshold = clusterer.Param().rec.tpc.noisyPadSaturationThreshold;
735735
const bool isNoisy = (!saturationThreshold || maxCharge < saturationThreshold) && ((totalChargesBaseline > 0 && totalCharges >= totalChargesBaseline) || (consecChargesBaseline > 0 && consecCharges >= consecChargesBaseline));
@@ -821,7 +821,7 @@ GPUd() void GPUTPCCFHIPClusterizer::Thread<0>(int32_t nBlocks, int32_t nThreads,
821821
nTails = CAMath::Min(nTails, (uint32_t)MaxHIPTailsPerRow - 1);
822822

823823
const auto* tails = GetHIPTails(clusterer, row);
824-
const auto& fragment = clusterer.mPmemory->fragment;
824+
const auto& frag = clusterer.mPmemory->frag;
825825

826826
auto* clusterPosInRow = clusterer.mPhipClusterPosInRow
827827
? clusterer.mPhipClusterPosInRow + row * MaxHIPTailsPerRow
@@ -879,7 +879,7 @@ GPUd() void GPUTPCCFHIPClusterizer::Thread<0>(int32_t nBlocks, int32_t nThreads,
879879
// Use the middle of the saturated plateau, averaged over all tails of the cluster that were triggered by saturation on their own pad.
880880
// Computed only here: chains consisting only of tails inherited from neighboring pads have no saturated plateau,
881881
// but these never contain a saturated charge and are dropped by the qMax cut.
882-
const float clusterTime = fragment.start + satTimeSum / nSatTails - clusterer.Param().rec.tpc.clustersShiftTimebinsClusterizer;
882+
const float clusterTime = frag.start + satTimeSum / nSatTails - clusterer.Param().rec.tpc.clustersShiftTimebinsClusterizer;
883883
assert(!CAMath::IsNaN(clusterTime));
884884
cn.setTimeFlags(clusterTime, 0);
885885

‎GPU/GPUTracking/TPCClusterFinder/GPUTPCCFClusterizer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ GPUdii() void GPUTPCCFClusterizer::Thread<0>(int32_t nBlocks, int32_t nThreads,
3535

3636
tpc::ClusterNative* clusterOut = onlyMC ? nullptr : clusterer.mPclusterByRow;
3737

38-
GPUTPCCFClusterizer::computeClustersImpl(get_num_groups(0), get_local_size(0), get_group_id(0), get_local_id(0), clusterer, clusterer.mPmemory->fragment, smem, chargeMap, clusterer.mPfilteredPeakPositions, clusterer.Param().rec, CPU_PTR(&labelAcc), clusterer.mPmemory->counters.nClusters, clusterer.mNMaxClusterPerRow, clusterer.mPclusterInRow, clusterOut, clusterer.mPclusterPosInRow, true);
38+
GPUTPCCFClusterizer::computeClustersImpl(get_num_groups(0), get_local_size(0), get_group_id(0), get_local_id(0), clusterer, clusterer.mPmemory->frag, smem, chargeMap, clusterer.mPfilteredPeakPositions, clusterer.Param().rec, CPU_PTR(&labelAcc), clusterer.mPmemory->counters.nClusters, clusterer.mNMaxClusterPerRow, clusterer.mPclusterInRow, clusterOut, clusterer.mPclusterPosInRow, true);
3939
}

‎GPU/GPUTracking/TPCClusterFinder/GPUTPCCFClusterizer.inc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
GPUdii() void GPUTPCCFClusterizer::computeClustersImpl(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread,
1919
processorType& clusterer,
20-
const CfFragment& fragment,
20+
const CfFragment& frag,
2121
GPUSharedMemory& smem,
2222
const CfArray2D<PackedCharge>& chargeMap,
2323
const CfChargePos* filteredPeakPositions,
@@ -54,14 +54,14 @@ GPUdii() void GPUTPCCFClusterizer::computeClustersImpl(int32_t nBlocks, int32_t
5454
if (idx >= clusternum) {
5555
return;
5656
}
57-
if (fragment.isOverlap(pos.time())) {
57+
if (frag.isOverlap(pos.time())) {
5858
if (clusterPosInRow) {
5959
clusterPosInRow[idx] = maxClusterPerRow;
6060
}
6161
return;
6262
}
6363
tpc::ClusterNative myCluster;
64-
pc.finalize(pos, charge, fragment.start);
64+
pc.finalize(pos, charge, frag.start);
6565
bool rejectCluster = !pc.toNative(pos, charge, myCluster, clusterer.Param(), chargeMap);
6666
if (!isAccepted) {
6767
rejectCluster = true;

‎GPU/GPUTracking/TPCClusterFinder/GPUTPCCFDecodeZS.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ GPUdii() void GPUTPCCFDecodeZS::decode(GPUTPCClusterFinder& clusterer, GPUShared
172172
seqLen = rowData[(nSeq + 1) * 2] - rowData[nSeq * 2];
173173
pad = rowData[nSeq++ * 2 + 1];
174174
}
175-
const CfFragment& fragment = clusterer.mPmemory->fragment;
175+
const CfFragment& frag = clusterer.mPmemory->frag;
176176
TPCTime globalTime = timeBin + l;
177-
bool discardTimeBin = not fragment.contains(globalTime);
177+
bool discardTimeBin = not frag.contains(globalTime);
178178
discardTimeBin |= (tpcTimeBinCut > 0 && globalTime > tpcTimeBinCut);
179179

180180
Row row = rowOffset + m;
181-
CfChargePos pos(row, Pad(pad), discardTimeBin ? INVALID_TIME_BIN : fragment.toLocal(globalTime));
181+
CfChargePos pos(row, Pad(pad), discardTimeBin ? INVALID_TIME_BIN : frag.toLocal(globalTime));
182182
positions[nDigitsTmp++] = pos;
183183

184184
if (!discardTimeBin) {
@@ -219,7 +219,7 @@ GPUdii() void GPUTPCCFDecodeZSLink::Thread<0>(int32_t nBlocks, int32_t nThreads,
219219

220220
GPUd() size_t GPUTPCCFDecodeZSLink::DecodePage(GPUSharedMemory& smem, DecodeCtx& ctx)
221221
{
222-
const CfFragment& fragment = ctx.clusterer.mPmemory->fragment;
222+
const CfFragment& frag = ctx.clusterer.mPmemory->frag;
223223

224224
const auto* rdHdr = ConsumeHeader<header::RAWDataHeader>(ctx.page);
225225

@@ -246,7 +246,7 @@ GPUd() size_t GPUTPCCFDecodeZSLink::DecodePage(GPUSharedMemory& smem, DecodeCtx&
246246

247247
nDecoded += nAdc;
248248

249-
bool discardTimeBin = not fragment.contains(timeBin);
249+
bool discardTimeBin = not frag.contains(timeBin);
250250
discardTimeBin |= (ctx.tpcTimeBinCut > 0 && timeBin > ctx.tpcTimeBinCut);
251251

252252
if (discardTimeBin) {
@@ -331,9 +331,9 @@ GPUd() void GPUTPCCFDecodeZSLink::DecodeTB(
331331
}
332332

333333
o2::tpc::PadPos padAndRow = GetPadAndRowFromFEC(ctx.clusterer, cru, rawFECChannel, fecInPartition);
334-
const CfFragment& fragment = ctx.clusterer.mPmemory->fragment;
334+
const CfFragment& frag = ctx.clusterer.mPmemory->frag;
335335
float charge = ADCToFloat(adc, DECODE_MASK, DECODE_BITS_FACTOR);
336-
WriteCharge(ctx.clusterer, charge, padAndRow, fragment.toLocal(timeBin), ctx.pageDigitOffset + myOffset);
336+
WriteCharge(ctx.clusterer, charge, padAndRow, frag.toLocal(timeBin), ctx.pageDigitOffset + myOffset);
337337

338338
} // for (uint8_t i = iThread; blockOffset < nAdc; i += NThreads)
339339
}
@@ -651,7 +651,7 @@ GPUd() int16_t GPUTPCCFDecodeZSDenseLink::DecodeTB(
651651
constexpr int32_t NTHREADS = GPUCA_GET_THREAD_COUNT(GPUCA_LB_GPUTPCCFDecodeZSDenseLink);
652652
static_assert(NTHREADS == GPUCA_WARP_SIZE, "Decoding TB Headers in parallel assumes block size is a single warp.");
653653

654-
const CfFragment& fragment = ctx.clusterer.mPmemory->fragment;
654+
const CfFragment& frag = ctx.clusterer.mPmemory->frag;
655655

656656
// Read timebin block header
657657
uint16_t tbbHdr = ConsumeByte(ctx.page);
@@ -721,7 +721,7 @@ GPUd() int16_t GPUTPCCFDecodeZSDenseLink::DecodeTB(
721721
const uint8_t* adcData = ConsumeBytes(ctx.page, (nSamplesInTB * DECODE_BITS + 7) / 8);
722722
MAYBE_PAGE_OVERFLOW(ctx.page);
723723

724-
bool discardTimeBin = not fragment.contains(timeBin);
724+
bool discardTimeBin = not frag.contains(timeBin);
725725
discardTimeBin |= (ctx.tpcTimeBinCut > 0 && timeBin > ctx.tpcTimeBinCut);
726726

727727
if (discardTimeBin) {
@@ -754,7 +754,7 @@ GPUd() int16_t GPUTPCCFDecodeZSDenseLink::DecodeTB(
754754
o2::tpc::PadPos padAndRow = GetPadAndRowFromFEC(ctx.clusterer, cru, rawFECChannelLink, smem.linkIds[iLink]);
755755

756756
float charge = ADCToFloat(adc, DECODE_MASK, DECODE_BITS_FACTOR);
757-
WriteCharge(ctx.clusterer, charge, padAndRow, fragment.toLocal(timeBin), ctx.pageDigitOffset + sample);
757+
WriteCharge(ctx.clusterer, charge, padAndRow, frag.toLocal(timeBin), ctx.pageDigitOffset + sample);
758758

759759
} // for (uint16_t sample = iThread; sample < nSamplesInTB; sample += NTHREADS)
760760

‎GPU/GPUTracking/TPCClusterFinder/GPUTPCClusterFinder.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class GPUTPCClusterFinder : public GPUProcessor
6363
uint32_t maxTimeBin = 0;
6464
uint32_t nPagesSubsector = 0;
6565
} counters;
66-
CfFragment fragment;
66+
CfFragment frag;
6767
};
6868

6969
struct ZSOffset {
@@ -105,9 +105,9 @@ class GPUTPCClusterFinder : public GPUProcessor
105105
CfChargePos* mPpeakPositions = nullptr;
106106
CfChargePos* mPfilteredPeakPositions = nullptr;
107107
uint8_t* mPisPeak = nullptr;
108-
uint32_t* mPclusterPosInRow = nullptr; // store the index where the corresponding cluster is stored in a bucket.
109-
// Required when MC are enabled to write the mc data to the correct position.
110-
// Set to >= mNMaxClusterPerRow if cluster was discarded.
108+
uint32_t* mPclusterPosInRow = nullptr; // store the index where the corresponding cluster is stored in a bucket.
109+
// Required when MC are enabled to write the mc data to the correct position.
110+
// Set to >= mNMaxClusterPerRow if cluster was discarded.
111111
uint32_t* mPhipClusterPosInRow = nullptr; // Identical to mPclusterPosInRow. Need a seperate array for HIP cluster because tail index is used to identify clusters across GPU and CPU
112112
uint16_t* mPchargeMap = nullptr;
113113
uint8_t* mPpeakMap = nullptr;

0 commit comments

Comments
 (0)