Skip to content

Commit 4979d84

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 89bee2f commit 4979d84

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2279,7 +2279,7 @@ GPUd() void GPUTPCGMMerger::ResolveHitWeights2(int32_t nBlocks, int32_t nThreads
22792279
continue;
22802280
}
22812281
const auto& best = candidates[candidates[0].best - 1];
2282-
const ClusterNative& GPUrestrict() cl = GetConstantMem()->ioPtrs.clustersNative->clustersLinear[best.id - 2];
2282+
const ClusterNative& GPUrestrict() cl = GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[best.id - 2];
22832283
uint8_t flags = (uint8_t)(cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags);
22842284
if ((mTrackRebuildHelper[i].highInclRowLow != 255 && j <= mTrackRebuildHelper[i].highInclRowLow) || (mTrackRebuildHelper[i].highInclRowHigh != 255 && j >= mTrackRebuildHelper[i].highInclRowHigh)) {
22852285
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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger& GPUrestrict() merger, int32_
140140
const bool dodEdx = param.dodEdxEnabled && param.rec.tpc.adddEdxSubThresholdClusters && finalFit && CAMath::Abs(cluster.row - lastUpdateRow) == 2 && cluster.sector == lastSector && currentClusterStatus == 0;
141141
const bool doAttach = allowChangeClusters && !param.rec.tpc.rebuildTrackInFit && !(merger.Param().rec.tpc.disableRefitAttachment & 2);
142142
const uint8_t doInterpolate = (param.rec.tpc.rebuildTrackInFit && iWay == nWays - 3) ? 1 : ((param.rec.tpc.rebuildTrackInFit && iWay == nWays - 2) ? 2 : 0);
143-
if (lastUpdateRow != 255 && ( dodEdx || doAttach || doInterpolate)) {
143+
if (lastUpdateRow != 255 && (dodEdx || doAttach || doInterpolate)) {
144144
int32_t step = cluster.row > lastPropagateRow ? 1 : -1;
145145
uint8_t sector = lastSector;
146146

@@ -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);
@@ -668,8 +668,8 @@ GPUd() void GPUTPCGMTrackParam::DodEdx(GPUdEdx& GPUrestrict() dEdx, GPUdEdx& GPU
668668
{
669669
const GPUParam& GPUrestrict() param = merger.Param();
670670
if GPUCA_RTC_CONSTEXPR (GPUCA_GET_CONSTEXPR(param.par, dodEdx)) {
671-
const GPUCalibObjectsConst& GPUrestrict() calib = merger.GetConstantMem()->calibObjects;
672-
const ClusterNative* GPUrestrict() clustersArray = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
671+
const GPUCalibObjectsConst& GPUrestrict() calib = merger.GetConstantMem() -> calibObjects;
672+
const ClusterNative* GPUrestrict() clustersArray = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
673673
if (param.dodEdxEnabled && finalFit) { // TODO: Costimize flag to remove, and option to remove double-clusters
674674
bool acc = (clusterState & param.rec.tpc.dEdxClusterRejectionFlagMask) == 0, accAlt = (clusterState & param.rec.tpc.dEdxClusterRejectionFlagMaskAlt) == 0;
675675
if (acc || accAlt) {
@@ -764,7 +764,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
764764
{
765765
const int32_t ihitFirst = ihit;
766766
{
767-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
767+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
768768
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), xx, yy, zz, mTOffset);
769769
}
770770
if (ihit + wayDirection >= 0 && ihit + wayDirection < maxN && clusters[ihit].row == clusters[ihit + wayDirection].row && clusters[ihit].sector == clusters[ihit + wayDirection].sector) {
@@ -798,7 +798,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
798798
const float tmpX = xx;
799799
float count;
800800
if (chkFunction(ihit, yy, zz)) {
801-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
801+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
802802
const float clamp = cl.qTot;
803803
xx *= clamp;
804804
yy *= clamp;
@@ -811,7 +811,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
811811
}
812812
do {
813813
ihit += wayDirection;
814-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
814+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
815815
const float clamp = cl.qTot;
816816
float clx, cly, clz;
817817
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), clx, cly, clz, mTOffset);
@@ -863,7 +863,7 @@ GPUd() float GPUTPCGMTrackParam::AttachClusters(const GPUTPCGMMerger& GPUrestric
863863
if (param.rec.tpc.disableRefitAttachment & 1) {
864864
return -1e6f;
865865
}
866-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
866+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
867867
const GPUTPCRow& GPUrestrict() row = tracker.Row(iRow);
868868
GPUglobalref() const cahit2* hits = tracker.HitData(row);
869869
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(row);
@@ -1138,7 +1138,7 @@ GPUd() float GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMergedTrackHit* GPUrestric
11381138
if (N == 0) {
11391139
N = 1;
11401140
}
1141-
const auto& GPUrestrict() cls = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
1141+
const auto& GPUrestrict() cls = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
11421142
float z0 = cls[clusters[0].num].getTime(), zn = cls[clusters[N - 1].num].getTime();
11431143
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)};
11441144
return ShiftZ(merger, clusters[0].sector, tmp[0], tmp[1], tmp[2]);
@@ -1246,7 +1246,7 @@ GPUdii() void GPUTPCGMTrackParam::RefitTrack(GPUTPCGMMergedTrack& GPUrestrict()
12461246
return;
12471247
}
12481248

1249-
CADEBUG(if (DEBUG_SINGLE_TRACK != -1 && iTrk != ((DEBUG_SINGLE_TRACK == -2 && getenv("DEBUG_TRACK")) ? atoi(getenv("DEBUG_TRACK")) : DEBUG_SINGLE_TRACK)) { track.SetNClusters(0); track.SetOK(0); return; } );
1249+
CADEBUG(if (DEBUG_SINGLE_TRACK != -1 && iTrk != ((DEBUG_SINGLE_TRACK == -2 && getenv("DEBUG_TRACK")) ? atoi(getenv("DEBUG_TRACK")) : DEBUG_SINGLE_TRACK)) { track.SetNClusters(0); track.SetOK(0); return; });
12501250

12511251
int32_t nTrackHits = track.NClusters();
12521252
int32_t NTolerated = 0; // Clusters not fit but tollerated for track length cut

0 commit comments

Comments
 (0)