Skip to content

Commit 15d4b8f

Browse files
committed
Please consider the following formatting changes
1 parent 89a46ed commit 15d4b8f

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

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

GPU/GPUTracking/Merger/GPUTPCGMPropagator.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,8 +654,8 @@ GPUd() void GPUTPCGMPropagator::InterpolateFill(float posY, float posZ, gputpcgm
654654

655655
GPUd() int32_t GPUTPCGMPropagator::InterpolateReject(const GPUParam& GPUrestrict() param, float posY, float posZ, int16_t clusterState, gputpcgmmergertypes::InterpolationErrorHit* inter, float err2Y, float err2Z, float deltaZ)
656656
{
657-
float* GPUrestrict() mC = mT->Cov();
658-
float* GPUrestrict() mP = mT->Par();
657+
float* GPUrestrict() mC = mT -> Cov();
658+
float* GPUrestrict() mP = mT -> Par();
659659
float chi2Y, chi2Z;
660660
if (mT->NDF() <= 0) {
661661
chi2Y = CAMath::Square((float)inter->posY - posY) / ((float)inter->errorY + err2Y);

GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ GPUdii() int32_t GPUTPCGMTrackParam::FitHit(GPUTPCGMMerger& GPUrestrict() merger
389389
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)
390390
{
391391
const GPUParam& GPUrestrict() param = merger.Param();
392-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
392+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
393393
const GPUTPCRow& GPUrestrict() rowData = tracker.Row(row);
394394
GPUglobalref() const cahit2* hits = tracker.HitData(rowData);
395395
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(rowData);
@@ -443,7 +443,7 @@ GPUdii() float GPUTPCGMTrackParam::FindBestInterpolatedHit(GPUTPCGMMerger& GPUre
443443

444444
if (dy * dy < sy2 && dz * dz < sz2) {
445445
float err2YA, err2ZA;
446-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
446+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
447447
const auto clflags = cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags;
448448
const float time = cl.getTime();
449449
const float invSqrtCharge = CAMath::InvSqrt(cl.qMax);
@@ -581,7 +581,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
581581
{
582582
const int32_t ihitFirst = ihit;
583583
{
584-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
584+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
585585
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), xx, yy, zz, mTOffset);
586586
}
587587
if (ihit + wayDirection >= 0 && ihit + wayDirection < maxN && clusters[ihit].row == clusters[ihit + wayDirection].row && clusters[ihit].sector == clusters[ihit + wayDirection].sector) {
@@ -615,7 +615,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
615615
const float tmpX = xx;
616616
float count;
617617
if (chkFunction(ihit, yy, zz)) {
618-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
618+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
619619
const float clamp = cl.qTot;
620620
xx *= clamp;
621621
yy *= clamp;
@@ -628,7 +628,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
628628
}
629629
do {
630630
ihit += wayDirection;
631-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
631+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
632632
const float clamp = cl.qTot;
633633
float clx, cly, clz;
634634
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), clx, cly, clz, mTOffset);
@@ -680,7 +680,7 @@ GPUd() float GPUTPCGMTrackParam::AttachClusters(const GPUTPCGMMerger& GPUrestric
680680
if (param.rec.tpc.disableRefitAttachment & 1) {
681681
return -1e6f;
682682
}
683-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
683+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
684684
const GPUTPCRow& GPUrestrict() row = tracker.Row(iRow);
685685
GPUglobalref() const cahit2* hits = tracker.HitData(row);
686686
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(row);
@@ -937,7 +937,7 @@ GPUd() float GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMergedTrackHit* GPUrestric
937937
if (N == 0) {
938938
N = 1;
939939
}
940-
const auto& GPUrestrict() cls = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
940+
const auto& GPUrestrict() cls = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
941941
float z0 = cls[clusters[0].num].getTime(), zn = cls[clusters[N - 1].num].getTime();
942942
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)};
943943
return ShiftZ(merger, clusters[0].sector, tmp[0], tmp[1], tmp[2]);

0 commit comments

Comments
 (0)