Skip to content

Commit 5c6fbdf

Browse files
committed
Please consider the following formatting changes
1 parent 15f2f6e commit 5c6fbdf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ void* GPUTPCGMMerger::SetPointersMerger(void* mem)
329329
computePointerWithAlignment(mem, mSharedCount, mNMaxClusters);
330330
memMax = (void*)std::max((size_t)mem, (size_t)memMax);
331331
mem = memBase;
332-
computePointerWithAlignment(mem, mLoopData, mNMaxTracks); // GPUTPCGMMergerTrackFit - GPUTPCGMMergerFollowLoopers, Reducing mNMaxTracks for mLoopData does not save memory, other parts are larger anyway
332+
computePointerWithAlignment(mem, mLoopData, mNMaxTracks); // GPUTPCGMMergerTrackFit - GPUTPCGMMergerFollowLoopers, Reducing mNMaxTracks for mLoopData does not save memory, other parts are larger anyway
333333
memMax = (void*)std::max((size_t)mem, (size_t)memMax);
334334
mem = memBase;
335335
computePointerWithAlignment(mem, mLooperCandidates, mNMaxLooperMatches); // MergeLoopers 1-3
@@ -1771,7 +1771,7 @@ GPUd() void GPUTPCGMMerger::PrepareForFit1(int32_t nBlocks, int32_t nThreads, in
17711771
if (!trk.CCE() && !trk.MergedLooper()) {
17721772
GPUTPCGMMergedTrack* updTrk = trk.GetFirstSegment(mMergedTracks);
17731773
const auto &cl0 = mClusters[trk.FirstClusterRef()], &cln = mClusters[updTrk->FirstClusterRef() + updTrk->NClusters() - 1];
1774-
const auto& GPUrestrict() cls = GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
1774+
const auto& GPUrestrict() cls = GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
17751775
float z0 = cls[cl0.num].getTime(), zn = cls[cln.num].getTime();
17761776
const auto tmp = zn > z0 ? std::array<float, 3>{zn, z0, GPUTPCGeometry::Row2X(cln.row)} : std::array<float, 3>{z0, zn, GPUTPCGeometry::Row2X(cl0.row)};
17771777
trk.Param().ShiftZ(this, cl0.sector, tmp[0], tmp[1], tmp[2]);

GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
440440
xx = yy = zz = 0.f;
441441
clusterState = 0;
442442
while (true) {
443-
const ClusterNative& GPUrestrict() cl = merger->GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
443+
const ClusterNative& GPUrestrict() cl = merger -> GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
444444
float clamp = cl.qTot;
445445
float clx, cly, clz;
446446
merger->GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), clx, cly, clz, mTOffset);
@@ -492,7 +492,7 @@ GPUd() float GPUTPCGMTrackParam::AttachClusters(const GPUTPCGMMerger* GPUrestric
492492
if (Merger->Param().rec.tpc.disableRefitAttachment & 1) {
493493
return -1e6f;
494494
}
495-
const GPUTPCTracker& GPUrestrict() tracker = *(Merger->GetConstantMem()->tpcTrackers + sector);
495+
const GPUTPCTracker& GPUrestrict() tracker = *(Merger -> GetConstantMem()->tpcTrackers + sector);
496496
const GPUTPCRow& GPUrestrict() row = tracker.Row(iRow);
497497
GPUglobalref() const cahit2* hits = tracker.HitData(row);
498498
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(row);
@@ -784,7 +784,7 @@ GPUd() float GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMergedTrackHit* clusters,
784784
if (N == 0) {
785785
N = 1;
786786
}
787-
const auto& GPUrestrict() cls = merger->GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
787+
const auto& GPUrestrict() cls = merger -> GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
788788
float z0 = cls[clusters[0].num].getTime(), zn = cls[clusters[N - 1].num].getTime();
789789
const auto tmp = zn > z0 ? std::array<float, 3>{zn, z0, GPUTPCGeometry::Row2X(clusters[N - 1].row)} : std::array<float, 3>{z0, zn, GPUTPCGeometry::Row2X(clusters[0].row)};
790790
return ShiftZ(merger, clusters[0].sector, tmp[0], tmp[1], tmp[2]);

0 commit comments

Comments
 (0)