Skip to content

Commit 3d6716a

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent e2c6886 commit 3d6716a

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger& GPUrestrict() merger, int32_
139139
const bool dodEdx = param.dodEdxEnabled && param.rec.tpc.adddEdxSubThresholdClusters && finalFit && CAMath::Abs(cluster.row - lastUpdateRow) == 2 && cluster.sector == lastSector && currentClusterStatus == 0;
140140
const bool doAttach = allowChangeClusters && !param.rec.tpc.rebuildTrackInFit && !(merger.Param().rec.tpc.disableRefitAttachment & 2);
141141
const uint8_t doInterpolate = (param.rec.tpc.rebuildTrackInFit && iWay == nWays - 3) ? 1 : ((param.rec.tpc.rebuildTrackInFit && iWay == nWays - 2) ? 2 : 0);
142-
if (lastUpdateRow != 255 && ( dodEdx || doAttach || doInterpolate)) {
142+
if (lastUpdateRow != 255 && (dodEdx || doAttach || doInterpolate)) {
143143
int32_t step = cluster.row > lastPropagateRow ? 1 : -1;
144144
uint8_t sector = lastSector;
145145

@@ -445,7 +445,7 @@ GPUdii() int32_t GPUTPCGMTrackParam::FitHit(GPUTPCGMMerger& GPUrestrict() merger
445445
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)
446446
{
447447
const GPUParam& GPUrestrict() param = merger.Param();
448-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
448+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
449449
const GPUTPCRow& GPUrestrict() rowData = tracker.Row(row);
450450
GPUglobalref() const cahit2* hits = tracker.HitData(rowData);
451451
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(rowData);
@@ -515,7 +515,7 @@ GPUdii() float GPUTPCGMTrackParam::FindBestInterpolatedHit(GPUTPCGMMerger& GPUre
515515

516516
if (dy * dy < sy2 && dz * dz < sz2) {
517517
float err2YA, err2ZA;
518-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
518+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[idOffset + ids[ih]];
519519
const auto clflags = cl.getFlags() & GPUTPCGMMergedTrackHit::clustererAndSharedFlags;
520520
const float time = cl.getTime();
521521
const float invSqrtCharge = CAMath::InvSqrt(cl.qMax);
@@ -582,8 +582,8 @@ GPUd() void GPUTPCGMTrackParam::DodEdx(GPUdEdx& GPUrestrict() dEdx, GPUdEdx& GPU
582582
{
583583
const GPUParam& GPUrestrict() param = merger.Param();
584584
if GPUCA_RTC_CONSTEXPR (GPUCA_GET_CONSTEXPR(param.par, dodEdx)) {
585-
const GPUCalibObjectsConst& GPUrestrict() calib = merger.GetConstantMem()->calibObjects;
586-
const ClusterNative* GPUrestrict() clustersArray = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
585+
const GPUCalibObjectsConst& GPUrestrict() calib = merger.GetConstantMem() -> calibObjects;
586+
const ClusterNative* GPUrestrict() clustersArray = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
587587
if (param.dodEdxEnabled && finalFit) { // TODO: Costimize flag to remove, and option to remove double-clusters
588588
bool acc = (clusterState & param.rec.tpc.dEdxClusterRejectionFlagMask) == 0, accAlt = (clusterState & param.rec.tpc.dEdxClusterRejectionFlagMaskAlt) == 0;
589589
if (acc || accAlt) {
@@ -678,7 +678,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
678678
{
679679
const int32_t ihitFirst = ihit;
680680
{
681-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
681+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
682682
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), xx, yy, zz, mTOffset);
683683
}
684684
if (ihit + wayDirection >= 0 && ihit + wayDirection < maxN && clusters[ihit].row == clusters[ihit + wayDirection].row && clusters[ihit].sector == clusters[ihit + wayDirection].sector) {
@@ -712,7 +712,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
712712
const float tmpX = xx;
713713
float count;
714714
if (chkFunction(ihit, yy, zz)) {
715-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
715+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
716716
const float clamp = cl.qTot;
717717
xx *= clamp;
718718
yy *= clamp;
@@ -725,7 +725,7 @@ GPUd() int32_t GPUTPCGMTrackParam::MergeDoubleRowClusters(int32_t& ihit, int32_t
725725
}
726726
do {
727727
ihit += wayDirection;
728-
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
728+
const ClusterNative& GPUrestrict() cl = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
729729
const float clamp = cl.qTot;
730730
float clx, cly, clz;
731731
merger.GetConstantMem()->calibObjects.fastTransformHelper->Transform(clusters[ihit].sector, clusters[ihit].row, cl.getPad(), cl.getTime(), clx, cly, clz, mTOffset);
@@ -777,7 +777,7 @@ GPUd() float GPUTPCGMTrackParam::AttachClusters(const GPUTPCGMMerger& GPUrestric
777777
if (param.rec.tpc.disableRefitAttachment & 1) {
778778
return -1e6f;
779779
}
780-
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem()->tpcTrackers + sector);
780+
const GPUTPCTracker& GPUrestrict() tracker = *(merger.GetConstantMem() -> tpcTrackers + sector);
781781
const GPUTPCRow& GPUrestrict() row = tracker.Row(iRow);
782782
GPUglobalref() const cahit2* hits = tracker.HitData(row);
783783
GPUglobalref() const calink* firsthit = tracker.FirstHitInBin(row);
@@ -1046,7 +1046,7 @@ GPUd() float GPUTPCGMTrackParam::ShiftZ(const GPUTPCGMMergedTrackHit* GPUrestric
10461046
if (N == 0) {
10471047
N = 1;
10481048
}
1049-
const auto& GPUrestrict() cls = merger.GetConstantMem()->ioPtrs.clustersNative->clustersLinear;
1049+
const auto& GPUrestrict() cls = merger.GetConstantMem() -> ioPtrs.clustersNative->clustersLinear;
10501050
float z0 = cls[clusters[0].num].getTime(), zn = cls[clusters[N - 1].num].getTime();
10511051
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)};
10521052
return ShiftZ(merger, clusters[0].sector, tmp[0], tmp[1], tmp[2]);
@@ -1154,7 +1154,7 @@ GPUdii() void GPUTPCGMTrackParam::RefitTrack(GPUTPCGMMergedTrack& GPUrestrict()
11541154
return;
11551155
}
11561156

1157-
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; } );
1157+
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; });
11581158

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

0 commit comments

Comments
 (0)