Skip to content

Commit 46fea3b

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 131773e commit 46fea3b

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2281,7 +2281,7 @@ GPUd() void GPUTPCGMMerger::ResolveHitWeights2(int32_t nBlocks, int32_t nThreads
22812281
continue;
22822282
}
22832283
const auto& best = candidates[candidates[0].best - 1];
2284-
const ClusterNative& GPUrestrict() cl = GetConstantMem()->ioPtrs.clustersNative->clustersLinear[best.id - 2];
2284+
const ClusterNative& GPUrestrict() cl = GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[best.id - 2];
22852285
uint8_t flags = (uint8_t)(cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags);
22862286
if ((mTrackRebuildHelper[i].highInclRowLow != 255 && j <= mTrackRebuildHelper[i].highInclRowLow) || (mTrackRebuildHelper[i].highInclRowHigh != 255 && j >= mTrackRebuildHelper[i].highInclRowHigh)) {
22872287
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
@@ -325,7 +325,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger& GPUrestrict() merger, int32_
325325
auto& candidate = merger.ClusterCandidates()[(iTrk * GPUCA_ROW_COUNT + iRow) * param.rec.tpc.rebuildTrackInFitClusterCandidates + 0];
326326
if (candidate.id >= 2) {
327327
float err2Y, err2Z, xx, yy, zz;
328-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[candidate.id - 2];
328+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[candidate.id - 2];
329329
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(sector, iRow, cl.getPad(), cl.getTime(), xx, yy, zz, mTOffset);
330330
if (prop.PropagateToXAlpha(xx, prop.GetAlpha(), inFlyDirection)) {
331331
candidate.best = -1;
@@ -531,7 +531,7 @@ GPUdii() int32_t GPUTPCGMTrackParam::FitHit(GPUTPCGMMerger& GPUrestrict() merger
531531
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)
532532
{
533533
const GPUParam& GPUrestrict() param = merger.Param();
534-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
534+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
535535
const GPUTPCRow& GPUrestrict() rowData = tracker.Row(row);
536536
GPUglobalref() const cahit2* hits = tracker.HitData(rowData);
537537
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(rowData);
@@ -601,7 +601,7 @@ GPUdii() float GPUTPCGMTrackParam::FindBestInterpolatedHit(GPUTPCGMMerger& GPUre
601601

602602
if (dy * dy < sy2 && dz * dz < sz2) {
603603
float err2YA, err2ZA;
604-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
604+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
605605
const auto clflags = cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags;
606606
const float time = cl.getTime();
607607
const float invSqrtCharge = CAMath::InvSqrt(cl.qMax);
@@ -667,8 +667,8 @@ GPUd() void GPUTPCGMTrackParam::DodEdx(GPUdEdx& GPUrestrict() dEdx, GPUdEdx& GPU
667667
{
668668
const GPUParam& GPUrestrict() param = merger.Param();
669669
if GPUCA_RTC_CONSTEXPR (GPUCA_GET_CONSTEXPR(param.par, dodEdx)) {
670-
const GPUCalibObjectsConst& GPUrestrict() calib = merger.GetConstantMem()->calibObjects;
671-
const ClusterNative* GPUrestrict() clustersArray = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
670+
const GPUCalibObjectsConst& GPUrestrict() calib = merger.GetConstantMem() -> calibObjects;
671+
const ClusterNative* GPUrestrict() clustersArray = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
672672
if (param.dodEdxEnabled && finalFit) { // TODO: Costimize flag to remove, and option to remove double-clusters
673673
bool acc = (clusterState & param.rec.tpc.dEdxClusterRejectionFlagMask) == 0, accAlt = (clusterState & param.rec.tpc.dEdxClusterRejectionFlagMaskAlt) == 0;
674674
if (acc || accAlt) {
@@ -763,7 +763,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
763763
{
764764
const int32_t ihitFirst = ihit;
765765
{
766-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
766+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
767767
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), xx, yy, zz, mTOffset);
768768
}
769769
if (ihit + wayDirection >= 0 && ihit + wayDirection < maxN && clusters[ihit].row == clusters[ihit + wayDirection].row && clusters[ihit].sector == clusters[ihit + wayDirection].sector) {
@@ -797,7 +797,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
797797
const float tmpX = xx;
798798
float count;
799799
if (chkFunction(ihit, yy, zz)) {
800-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
800+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
801801
const float clamp = cl.qTot;
802802
xx *= clamp;
803803
yy *= clamp;
@@ -810,7 +810,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
810810
}
811811
do {
812812
ihit += wayDirection;
813-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
813+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
814814
const float clamp = cl.qTot;
815815
float clx, cly, clz;
816816
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), clx, cly, clz, mTOffset);
@@ -862,7 +862,7 @@ GPUd() float GPUTPCGMTrackParam::AttachClusters(const GPUTPCGMMerger& GPUrestric
862862
if (param.rec.tpc.disableMarkAdjacent & 1) {
863863
return -1e6f;
864864
}
865-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
865+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
866866
const GPUTPCRow& GPUrestrict() row = tracker.Row(iRow);
867867
GPUglobalref() const cahit2* hits = tracker.HitData(row);
868868
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(row);
@@ -1137,7 +1137,7 @@ GPUd() float GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMergedTrackHit* GPUrestric
11371137
if (N == 0) {
11381138
N = 1;
11391139
}
1140-
const auto& GPUrestrict() cls = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
1140+
const auto& GPUrestrict() cls = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
11411141
float z0 = cls[clusters[0].num].getTime(), zn = cls[clusters[N - 1].num].getTime();
11421142
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)};
11431143
return ShiftZ(merger, clusters[0].sector, tmp[0], tmp[1], tmp[2]);

0 commit comments

Comments
 (0)