Skip to content

Commit 985be4b

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 810e9a0 commit 985be4b

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

‎GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ int32_t GPUTPCGMMerger::CheckSectors()
553553

554554
void GPUTPCGMMerger::CreateMCLabels(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread)
555555
{
556-
const o2::tpc::ClusterNativeAccess* GPUrestrict() clusters = GetConstantMem()->ioPtrs.clustersNative;
556+
const o2::tpc::ClusterNativeAccess* GPUrestrict() clusters = GetConstantMem() -> ioPtrs.clustersNative;
557557
if (clusters == nullptr || clusters->clustersMCTruth == nullptr) {
558558
return;
559559
}
@@ -2313,7 +2313,7 @@ GPUd() void GPUTPCGMMerger::ResolveHitWeights2(int32_t nBlocks, int32_t nThreads
23132313
continue;
23142314
}
23152315
const auto& best = candidates[candidates[0].best - 1];
2316-
const ClusterNative& GPUrestrict() cl = GetConstantMem()->ioPtrs.clustersNative->clustersLinear[best.id - 2];
2316+
const ClusterNative& GPUrestrict() cl = GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[best.id - 2];
23172317
uint8_t flags = (uint8_t)(cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags);
23182318
if ((mTrackRebuildHelper[i].highInclRowLow != 255 && j <= mTrackRebuildHelper[i].highInclRowLow) || (mTrackRebuildHelper[i].highInclRowHigh != 255 && j >= mTrackRebuildHelper[i].highInclRowHigh)) {
23192319
flags |= GPUTPCGMMergedTrackHit::flagHighIncl;

‎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(gputpcgmmergertypes::Interpolati
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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger& GPUrestrict() merger, int32_
341341
}
342342
#endif
343343
float err2Y, err2Z, xx, yy, zz;
344-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[candidate.id - 2];
344+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[candidate.id - 2];
345345
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(sector, iRow, cl.getPad(), cl.getTime(), xx, yy, zz, mTOffset);
346346
if (prop.PropagateToXAlpha(xx, prop.GetAlpha(), inFlyDirection)) {
347347
candidate.best = -1;
@@ -563,7 +563,7 @@ GPUdii() int32_t GPUTPCGMTrackParam::FitHit(GPUTPCGMMerger& GPUrestrict() merger
563563
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, bool interOnly)
564564
{
565565
const GPUParam& GPUrestrict() param = merger.Param();
566-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
566+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
567567
const GPUTPCRow& GPUrestrict() rowData = tracker.Row(row);
568568
GPUglobalref() const cahit2* hits = tracker.HitData(rowData);
569569
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(rowData);
@@ -633,7 +633,7 @@ GPUdii() float GPUTPCGMTrackParam::FindBestInterpolatedHit(GPUTPCGMMerger& GPUre
633633

634634
if (dy * dy < sy2 && dz * dz < sz2) {
635635
float err2YA, err2ZA;
636-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
636+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
637637
const auto clflags = cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags;
638638
const float time = cl.getTime();
639639
const float invSqrtCharge = CAMath::InvSqrt(cl.qMax);
@@ -699,8 +699,8 @@ GPUd() void GPUTPCGMTrackParam::DodEdx(GPUdEdx& GPUrestrict() dEdx, GPUdEdx& GPU
699699
{
700700
const GPUParam& GPUrestrict() param = merger.Param();
701701
if GPUCA_RTC_CONSTEXPR (GPUCA_GET_CONSTEXPR(param.par, dodEdx)) {
702-
const GPUCalibObjectsConst& GPUrestrict() calib = merger.GetConstantMem()->calibObjects;
703-
const ClusterNative* GPUrestrict() clustersArray = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
702+
const GPUCalibObjectsConst& GPUrestrict() calib = merger.GetConstantMem() -> calibObjects;
703+
const ClusterNative* GPUrestrict() clustersArray = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
704704
if (param.dodEdxEnabled && finalFit) { // TODO: Costimize flag to remove, and option to remove double-clusters
705705
bool acc = (clusterState & param.rec.tpc.dEdxClusterRejectionFlagMask) == 0, accAlt = (clusterState & param.rec.tpc.dEdxClusterRejectionFlagMaskAlt) == 0;
706706
if (acc || accAlt) {
@@ -795,7 +795,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
795795
{
796796
const int32_t ihitFirst = ihit;
797797
{
798-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
798+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
799799
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), xx, yy, zz, mTOffset);
800800
}
801801
if (ihit + wayDirection >= 0 && ihit + wayDirection < maxN && clusters[ihit].row == clusters[ihit + wayDirection].row && clusters[ihit].sector == clusters[ihit + wayDirection].sector) {
@@ -829,7 +829,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
829829
const float tmpX = xx;
830830
float count;
831831
if (chkFunction(ihit, yy, zz)) {
832-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
832+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
833833
const float clamp = cl.qTot;
834834
xx *= clamp;
835835
yy *= clamp;
@@ -842,7 +842,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
842842
}
843843
do {
844844
ihit += wayDirection;
845-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
845+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
846846
const float clamp = cl.qTot;
847847
float clx, cly, clz;
848848
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), clx, cly, clz, mTOffset);
@@ -894,7 +894,7 @@ GPUd() float GPUTPCGMTrackParam::AttachClusters(const GPUTPCGMMerger& GPUrestric
894894
if (param.rec.tpc.disableMarkAdjacent & 1) {
895895
return -1e6f;
896896
}
897-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
897+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
898898
const GPUTPCRow& GPUrestrict() row = tracker.Row(iRow);
899899
GPUglobalref() const cahit2* hits = tracker.HitData(row);
900900
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(row);
@@ -1169,7 +1169,7 @@ GPUd() float GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMergedTrackHit* GPUrestric
11691169
if (N == 0) {
11701170
N = 1;
11711171
}
1172-
const auto& GPUrestrict() cls = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
1172+
const auto& GPUrestrict() cls = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
11731173
float z0 = cls[clusters[0].num].getTime(), zn = cls[clusters[N - 1].num].getTime();
11741174
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)};
11751175
return ShiftZ(merger, clusters[0].sector, tmp[0], tmp[1], tmp[2]);

0 commit comments

Comments
 (0)