Skip to content

Commit 61bc4ab

Browse files
committed
Please consider the following formatting changes
1 parent 28ceb99 commit 61bc4ab

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2252,7 +2252,7 @@ GPUd() void GPUTPCGMMerger::ResolveHitWeights(int32_t nBlocks, int32_t nThreads,
22522252
continue;
22532253
}
22542254
const auto& best = candidates[candidates[0].best - 1];
2255-
const ClusterNative& GPUrestrict() cl = GetConstantMem()->ioPtrs.clustersNative->clustersLinear[best.id - 2];
2255+
const ClusterNative& GPUrestrict() cl = GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[best.id - 2];
22562256
outCl = {.num = best.id - 2, .sector = best.sector, .row = (uint8_t)j, .state = (uint8_t)(cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags)};
22572257
written++;
22582258
CADEBUG(printf("REBUILD: iTrk %d Assigned Cluster Row %d Hit %d\n", i, j, best.id - 2));

GPU/GPUTracking/Merger/GPUTPCGMMergerDump.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ void GPUTPCGMMerger::DumpInterpolatedHits(std::ostream& out) const
291291
out << "\n";
292292
}
293293

294-
295294
template <int32_t mergeType>
296295
inline void GPUTPCGMMerger::MergedTrackStreamerInternal(const GPUTPCGMBorderTrack& b1, const GPUTPCGMBorderTrack& b2, const char* name, int32_t sector1, int32_t sector2, int32_t mergeMode, float weight, float frac) const
297296
{

GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger& GPUrestrict() merger, int32_
133133
const float clAlpha = param.Alpha(clusters[ihit].sector);
134134
float xx, yy, zz;
135135
{
136-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
136+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
137137
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), xx, yy, zz, mTOffset);
138138
}
139139
// clang-format off
@@ -367,7 +367,7 @@ GPUdii() int32_t GPUTPCGMTrackParam::FitHit(GPUTPCGMMerger& GPUrestrict() merger
367367
GPUdii() float GPUTPCGMTrackParam::FindBestInterpolatedHit(GPUTPCGMMerger& GPUrestrict() merger, gputpcgmmergertypes::InterpolationErrorHit& GPUrestrict() inter, const uint8_t sector, const uint8_t row, const float deltaZ, const float sumInvSqrtCharge, const int nAvgCharge, const GPUTPCGMPropagator& GPUrestrict() prop, const int32_t iTrk)
368368
{
369369
const GPUParam& GPUrestrict() param = merger.Param();
370-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
370+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
371371
const GPUTPCRow& GPUrestrict() rowData = tracker.Row(row);
372372
GPUglobalref() const cahit2* hits = tracker.HitData(rowData);
373373
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(rowData);
@@ -421,7 +421,7 @@ GPUdii() float GPUTPCGMTrackParam::FindBestInterpolatedHit(GPUTPCGMMerger& GPUre
421421

422422
if (dy * dy < sy2 && dz * dz < sz2) {
423423
float err2YA, err2ZA;
424-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
424+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
425425
const auto clflags = cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags;
426426
const float time = cl.getTime();
427427
const float invSqrtCharge = CAMath::InvSqrt(cl.qMax);
@@ -573,7 +573,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
573573
xx = yy = zz = 0.f;
574574
clusterState = 0;
575575
while (true) {
576-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
576+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
577577
float clamp = cl.qTot;
578578
float clx, cly, clz;
579579
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), clx, cly, clz, mTOffset);
@@ -626,7 +626,7 @@ GPUd() float GPUTPCGMTrackParam::AttachClusters(const GPUTPCGMMerger& GPUrestric
626626
if (param.rec.tpc.disableRefitAttachment & 1) {
627627
return -1e6f;
628628
}
629-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
629+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
630630
const GPUTPCRow& GPUrestrict() row = tracker.Row(iRow);
631631
GPUglobalref() const cahit2* hits = tracker.HitData(row);
632632
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(row);
@@ -642,7 +642,7 @@ GPUd() float GPUTPCGMTrackParam::AttachClusters(const GPUTPCGMMerger& GPUrestric
642642
int32_t bin, ny, nz;
643643

644644
float err2Y, err2Z;
645-
param.GetClusterErrors2(sector, iRow, Z, mP[2], mP[3], -1.f, 0.f, 0.f, err2Y, err2Z); // TODO: Use correct time/avgCharge
645+
param.GetClusterErrors2(sector, iRow, Z, mP[2], mP[3], -1.f, 0.f, 0.f, err2Y, err2Z); // TODO: Use correct time/avgCharge
646646
const float sy2 = CAMath::Min(param.rec.tpc.tubeMaxSize2, param.rec.tpc.tubeChi2 * (err2Y + CAMath::Abs(mC[0]))); // Cov can be bogus when following circle
647647
const float sz2 = CAMath::Min(param.rec.tpc.tubeMaxSize2, param.rec.tpc.tubeChi2 * (err2Z + CAMath::Abs(mC[2]))); // In that case we should provide the track error externally
648648
const float tubeY = CAMath::Sqrt(sy2);
@@ -921,7 +921,7 @@ GPUd() float GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMergedTrackHit* GPUrestric
921921
if (N == 0) {
922922
N = 1;
923923
}
924-
const auto& GPUrestrict() cls = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
924+
const auto& GPUrestrict() cls = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
925925
float z0 = cls[clusters[0].num].getTime(), zn = cls[clusters[N - 1].num].getTime();
926926
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)};
927927
return ShiftZ(merger, clusters[0].sector, tmp[0], tmp[1], tmp[2]);

0 commit comments

Comments
 (0)