From 85576445ee6b89c8675978d738d170895ce1c25a Mon Sep 17 00:00:00 2001 From: Slava Krutelyov Date: Fri, 2 Aug 2024 08:16:42 -0700 Subject: [PATCH] remove spurious semicolons at the end of method implementations --- RecoTracker/LSTCore/interface/Module.h | 6 +-- RecoTracker/LSTCore/src/ModuleMethods.h | 12 ++--- RecoTracker/LSTCore/src/alpaka/Hit.h | 14 +++--- RecoTracker/LSTCore/src/alpaka/Kernels.h | 14 +++--- RecoTracker/LSTCore/src/alpaka/MiniDoublet.h | 16 +++---- .../LSTCore/src/alpaka/PixelQuintuplet.h | 20 ++++---- RecoTracker/LSTCore/src/alpaka/PixelTriplet.h | 6 +-- RecoTracker/LSTCore/src/alpaka/Quintuplet.h | 46 +++++++++---------- RecoTracker/LSTCore/src/alpaka/Segment.h | 18 ++++---- .../LSTCore/src/alpaka/TrackCandidate.h | 6 +-- RecoTracker/LSTCore/src/alpaka/Triplet.h | 16 +++---- 11 files changed, 87 insertions(+), 87 deletions(-) diff --git a/RecoTracker/LSTCore/interface/Module.h b/RecoTracker/LSTCore/interface/Module.h index d45415f800a4f..78396c195cd8f 100644 --- a/RecoTracker/LSTCore/interface/Module.h +++ b/RecoTracker/LSTCore/interface/Module.h @@ -72,15 +72,15 @@ namespace lst { } else { return false; } - }; + } static bool parseIsLower(bool isInvertedx, unsigned int detId) { return (isInvertedx) ? !(detId & 1) : (detId & 1); - }; + } static unsigned int parsePartnerModuleId(unsigned int detId, bool isLowerx, bool isInvertedx) { return isLowerx ? (isInvertedx ? detId - 1 : detId + 1) : (isInvertedx ? detId + 1 : detId - 1); - }; + } template void setData(TBuff const& buf) { diff --git a/RecoTracker/LSTCore/src/ModuleMethods.h b/RecoTracker/LSTCore/src/ModuleMethods.h index a5b16573db57b..54514cccf2b54 100644 --- a/RecoTracker/LSTCore/src/ModuleMethods.h +++ b/RecoTracker/LSTCore/src/ModuleMethods.h @@ -94,7 +94,7 @@ namespace lst { for (unsigned int icondet = 0; icondet < totalSizes_neg; icondet++) { connectedPixels[icondet + totalSizes + totalSizes_pos] = mmd.detIdToIndex.at(connectedModuleDetIds_neg[icondet]); } - }; + } inline void fillConnectedModuleArrayExplicit(ModulesBuffer& modulesBuf, ModuleMetaData const& mmd, @@ -111,7 +111,7 @@ namespace lst { moduleMap[index * max_connected_modules + i] = mmd.detIdToIndex.at(connectedModules[i]); } } - }; + } inline void fillMapArraysExplicit(ModulesBuffer& modulesBuf, ModuleMetaData const& mmd) { uint16_t* mapIdx = alpaka::getPtrNative(modulesBuf.mapIdx_buf); @@ -125,7 +125,7 @@ namespace lst { mapdetId[counter] = detId; counter++; } - }; + } inline void setDerivedQuantities(unsigned int detId, unsigned short& layer, @@ -148,7 +148,7 @@ namespace lst { r = std::sqrt(m_x * m_x + m_y * m_y + m_z * m_z); eta = ((m_z > 0) - (m_z < 0)) * std::acosh(r / std::sqrt(m_x * m_x + m_y * m_y)); - }; + } inline void loadCentroidsFromFile(const char* filePath, ModuleMetaData& mmd, uint16_t& nModules) { std::ifstream ifile(filePath, std::ios::binary); @@ -185,7 +185,7 @@ namespace lst { mmd.detIdToIndex[1] = counter; //pixel module is the last module in the module list counter++; nModules = counter; - }; + } inline ModulesBuffer loadModulesFromFile(MapPLStoLayer const& pLStoLayer, const char* moduleMetaDataFilePath, @@ -335,6 +335,6 @@ namespace lst { fillMapArraysExplicit(modulesBuf, mmd); return modulesBuf; - }; + } } // namespace lst #endif diff --git a/RecoTracker/LSTCore/src/alpaka/Hit.h b/RecoTracker/LSTCore/src/alpaka/Hit.h index c14ac26124e6d..c0eb481c73228 100644 --- a/RecoTracker/LSTCore/src/alpaka/Hit.h +++ b/RecoTracker/LSTCore/src/alpaka/Hit.h @@ -113,7 +113,7 @@ namespace lst { float rt = alpaka::math::sqrt(acc, x * x + y * y); float eta = ((z > 0) - (z < 0)) * alpaka::math::acosh(acc, r3 / rt); return eta; - }; + } template ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE float phi_mpi_pi(TAcc const& acc, float x) { @@ -123,24 +123,24 @@ namespace lst { constexpr float o2pi = 1.f / (2.f * float(M_PI)); float n = alpaka::math::round(acc, x * o2pi); return x - n * float(2.f * float(M_PI)); - }; + } template ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE float phi(TAcc const& acc, float x, float y) { return phi_mpi_pi(acc, float(M_PI) + alpaka::math::atan2(acc, -y, -x)); - }; + } template ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE float deltaPhi(TAcc const& acc, float x1, float y1, float x2, float y2) { float phi1 = phi(acc, x1, y1); float phi2 = phi(acc, x2, y2); return phi_mpi_pi(acc, (phi2 - phi1)); - }; + } template ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE float deltaPhiChange(TAcc const& acc, float x1, float y1, float x2, float y2) { return deltaPhi(acc, x1, y1, x2 - x1, y2 - y1); - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE float calculate_dPhi(float phi1, float phi2) { // Calculate dPhi @@ -154,7 +154,7 @@ namespace lst { } return dPhi; - }; + } ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE int binary_search(const unsigned int* data, // Array that we are searching over unsigned int search_val, // Value we want to find in data array @@ -175,7 +175,7 @@ namespace lst { } // Couldn't find search value in array. return -1; - }; + } struct moduleRangesKernel { template diff --git a/RecoTracker/LSTCore/src/alpaka/Kernels.h b/RecoTracker/LSTCore/src/alpaka/Kernels.h index 8e3fa46c3ab6f..496a3f2ce0fb2 100644 --- a/RecoTracker/LSTCore/src/alpaka/Kernels.h +++ b/RecoTracker/LSTCore/src/alpaka/Kernels.h @@ -18,23 +18,23 @@ namespace lst { unsigned int quintupletIndex, bool secondpass = false) { quintupletsInGPU.isDup[quintupletIndex] |= 1 + secondpass; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelTripletFromMemory(lst::PixelTriplets& pixelTripletsInGPU, unsigned int pixelTripletIndex) { pixelTripletsInGPU.isDup[pixelTripletIndex] = true; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelQuintupletFromMemory(lst::PixelQuintuplets& pixelQuintupletsInGPU, unsigned int pixelQuintupletIndex) { pixelQuintupletsInGPU.isDup[pixelQuintupletIndex] = true; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmPixelSegmentFromMemory(lst::Segments& segmentsInGPU, unsigned int pixelSegmentArrayIndex, bool secondpass = false) { segmentsInGPU.isDup[pixelSegmentArrayIndex] |= 1 + secondpass; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE int checkHitsT5(unsigned int ix, unsigned int jx, @@ -61,7 +61,7 @@ namespace lst { } } return nMatched; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE int checkHitspT5(unsigned int ix, unsigned int jx, @@ -88,7 +88,7 @@ namespace lst { } } return nMatched; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE void checkHitspT3(unsigned int ix, unsigned int jx, @@ -140,7 +140,7 @@ namespace lst { matched[0] = npMatched; matched[1] = nMatched; - }; + } struct removeDupQuintupletsInGPUAfterBuild { template diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h index 86a22d943c33f..bdbd366bba338 100644 --- a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h +++ b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h @@ -260,7 +260,7 @@ namespace lst { mdsInGPU.outerHighEdgeY[idx] = hitsInGPU.highEdgeYs[outerHitIndex]; mdsInGPU.outerLowEdgeX[idx] = hitsInGPU.lowEdgeXs[outerHitIndex]; mdsInGPU.outerLowEdgeY[idx] = hitsInGPU.lowEdgeYs[outerHitIndex]; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE float isTighterTiltedModules(lst::Modules const& modulesInGPU, uint16_t moduleIndex) { // The "tighter" tilted modules are the subset of tilted modules that have smaller spacing @@ -280,7 +280,7 @@ namespace lst { return false; } else return false; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize(struct lst::Modules const& modulesInGPU, uint16_t moduleIndex) { float miniDeltaTilted[3] = {0.26f, 0.26f, 0.26f}; @@ -331,7 +331,7 @@ namespace lst { } return moduleSeparation; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE float dPhiThreshold( @@ -390,7 +390,7 @@ namespace lst { else { return miniSlope + alpaka::math::sqrt(acc, miniMuls * miniMuls + miniPVoff * miniPVoff + miniLum * miniLum); } - }; + } template ALPAKA_FN_INLINE ALPAKA_FN_ACC void shiftStripHits(TAcc const& acc, @@ -556,7 +556,7 @@ namespace lst { shiftedCoords[0] = xn; shiftedCoords[1] = yn; shiftedCoords[2] = zn; - }; + } template ALPAKA_FN_ACC bool runMiniDoubletDefaultAlgo(TAcc const& acc, @@ -628,7 +628,7 @@ namespace lst { zUpper, rtUpper); } - }; + } template ALPAKA_FN_ACC bool runMiniDoubletDefaultAlgoBarrel(TAcc const& acc, @@ -755,7 +755,7 @@ namespace lst { } return alpaka::math::abs(acc, dPhiChange) < miniCut; - }; + } template ALPAKA_FN_ACC bool runMiniDoubletDefaultAlgoEndcap(TAcc const& acc, @@ -866,7 +866,7 @@ namespace lst { noShiftedDphichange = noShiftedDphi / dzFrac * (1.f + dzFrac); return alpaka::math::abs(acc, dPhiChange) < miniCut; - }; + } struct createMiniDoubletsInGPUv2 { template diff --git a/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h b/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h index ee172f9e05f6e..fcdcd4d7c78bb 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h @@ -201,7 +201,7 @@ namespace lst { pixelQuintupletsInGPU.rzChiSquared[pixelQuintupletIndex] = rzChiSquared; pixelQuintupletsInGPU.rPhiChiSquared[pixelQuintupletIndex] = rPhiChiSquared; pixelQuintupletsInGPU.rPhiChiSquaredInwards[pixelQuintupletIndex] = rPhiChiSquaredInwards; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passPT5RZChiSquaredCuts(lst::Modules const& modulesInGPU, uint16_t lowerModuleIndex1, @@ -291,7 +291,7 @@ namespace lst { } } return true; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passPT5RPhiChiSquaredCuts(lst::Modules const& modulesInGPU, uint16_t lowerModuleIndex1, @@ -381,7 +381,7 @@ namespace lst { } } return true; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE float computeChiSquaredpT5(TAcc const& acc, @@ -427,7 +427,7 @@ namespace lst { (xs[i] * xs[i] + ys[i] * ys[i] - 2 * g * xs[i] - 2 * f * ys[i] + c) / (sigma2); } return chiSquared; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE void computeSigmasForRegression_pT5(TAcc const& acc, @@ -513,7 +513,7 @@ namespace lst { } #endif } - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE float computePT5RPhiChiSquared(TAcc const& acc, @@ -536,7 +536,7 @@ namespace lst { chiSquared = computeChiSquaredpT5(acc, 5, xs, ys, delta1, delta2, slopes, isFlat, g, f, radius); return chiSquared; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE float computePT5RPhiChiSquaredInwards( float g, float f, float r, float* xPix, float* yPix) { @@ -551,7 +551,7 @@ namespace lst { } chiSquared *= 0.5f; return chiSquared; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passPT5RPhiChiSquaredInwardsCuts(lst::Modules const& modulesInGPU, uint16_t lowerModuleIndex1, @@ -641,7 +641,7 @@ namespace lst { } } return true; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runPixelQuintupletDefaultAlgo(TAcc const& acc, @@ -787,7 +787,7 @@ namespace lst { centerY = (centerY + T5CenterY) / 2; return true; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE float computePT5RZChiSquared(TAcc const& acc, @@ -831,7 +831,7 @@ namespace lst { RMSE = alpaka::math::sqrt(acc, 0.2f * RMSE); // Divided by the degree of freedom 5. return RMSE; - }; + } struct createPixelQuintupletsInGPUFromMapv2 { template diff --git a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h index 3b6faffbce426..4d6f88a8336be 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h @@ -1167,7 +1167,7 @@ namespace lst { //2nd update pt_beta = dr * lst::k2Rinv1GeVf / alpaka::math::sin(acc, betaAv); //get a better pt estimate } - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runTripletDefaultAlgoPPBB(TAcc const& acc, @@ -1425,7 +1425,7 @@ namespace lst { (alpaka::math::abs(acc, betaInRHmin - betaInRHmax) + alpaka::math::abs(acc, betaOutRHmin - betaOutRHmax))); float dBeta = betaIn - betaOut; return dBeta * dBeta <= dBetaCut2; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runTripletDefaultAlgoPPEE(TAcc const& acc, @@ -1689,7 +1689,7 @@ namespace lst { (alpaka::math::abs(acc, betaInRHmin - betaInRHmax) + alpaka::math::abs(acc, betaOutRHmin - betaOutRHmax))); float dBeta = betaIn - betaOut; return dBeta * dBeta <= dBetaCut2; - }; + } } // namespace lst #endif diff --git a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h index 1165d33f6da5e..ff6e6ea8380b3 100644 --- a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h @@ -148,7 +148,7 @@ namespace lst { float secondMin, float secondMax) { return ((firstMin <= secondMin) && (secondMin < firstMax)) || ((secondMin < firstMin) && (firstMin < secondMax)); - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE void addQuintupletToMemory(lst::Triplets const& tripletsInGPU, lst::Quintuplets& quintupletsInGPU, @@ -230,7 +230,7 @@ namespace lst { quintupletsInGPU.rzChiSquared[quintupletIndex] = rzChiSquared; quintupletsInGPU.chiSquared[quintupletIndex] = rPhiChiSquared; quintupletsInGPU.nonAnchorChiSquared[quintupletIndex] = nonAnchorChiSquared; - }; + } //90% constraint ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passChiSquaredConstraint(lst::Modules const& modulesInGPU, @@ -313,7 +313,7 @@ namespace lst { } return true; - }; + } //bounds can be found at http://uaf-10.t2.ucsd.edu/~bsathian/SDL/T5_RZFix/t5_rz_thresholds.txt template @@ -749,7 +749,7 @@ namespace lst { } } return true; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool T5HasCommonMiniDoublet(lst::Triplets const& tripletsInGPU, @@ -764,7 +764,7 @@ namespace lst { segmentsInGPU.mdIndices[2 * outerInnerSegmentIndex]; //outer triplet inner segment inner MD index return (innerOuterOuterMiniDoubletIndex == outerInnerInnerMiniDoubletIndex); - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE void computeErrorInRadius(TAcc const& acc, @@ -796,7 +796,7 @@ namespace lst { } } } - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool matchRadiiBBBEE12378(TAcc const& acc, @@ -820,7 +820,7 @@ namespace lst { innerInvRadiusMax, alpaka::math::min(acc, bridgeInvRadiusMin, 1.0f / bridgeRadiusMax2S), alpaka::math::max(acc, bridgeInvRadiusMax, 1.0f / bridgeRadiusMin2S)); - }; + } /*bounds for high Pt taken from : http://uaf-10.t2.ucsd.edu/~bsathian/SDL/T5_efficiency/efficiencies/new_efficiencies/efficiencies_20210513_T5_recovering_high_Pt_efficiencies/highE_radius_matching/highE_bounds.txt */ template @@ -845,7 +845,7 @@ namespace lst { bridgeInvRadiusMin = alpaka::math::max(acc, 0.f, (1.f - bridgeInvRadiusErrorBound) / bridgeRadius); return checkIntervalOverlap(innerInvRadiusMin, innerInvRadiusMax, bridgeInvRadiusMin, bridgeInvRadiusMax); - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool matchRadiiBBBBE(TAcc const& acc, @@ -869,7 +869,7 @@ namespace lst { bridgeInvRadiusMin = alpaka::math::max(acc, 0.f, (1.f - bridgeInvRadiusErrorBound) / bridgeRadius); return checkIntervalOverlap(innerInvRadiusMin, innerInvRadiusMax, bridgeInvRadiusMin, bridgeInvRadiusMax); - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool matchRadiiBBBEE23478(TAcc const& acc, @@ -893,7 +893,7 @@ namespace lst { innerInvRadiusMax, alpaka::math::min(acc, bridgeInvRadiusMin, 1.0f / bridgeRadiusMax2S), alpaka::math::max(acc, bridgeInvRadiusMax, 1.0f / bridgeRadiusMin2S)); - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool matchRadiiBBBEE34578(TAcc const& acc, @@ -917,7 +917,7 @@ namespace lst { innerInvRadiusMax, alpaka::math::min(acc, bridgeInvRadiusMin, 1.0f / bridgeRadiusMax2S), alpaka::math::max(acc, bridgeInvRadiusMax, 1.0f / bridgeRadiusMin2S)); - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool matchRadiiBBEEE(TAcc const& acc, @@ -947,7 +947,7 @@ namespace lst { innerInvRadiusMax, alpaka::math::min(acc, bridgeInvRadiusMin, 1.0f / bridgeRadiusMax2S), alpaka::math::max(acc, bridgeInvRadiusMax, 1.0f / bridgeRadiusMin2S)); - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool matchRadiiBEEEE(TAcc const& acc, @@ -978,7 +978,7 @@ namespace lst { alpaka::math::max(acc, innerInvRadiusMax, 1.0 / innerRadiusMin2S), alpaka::math::min(acc, bridgeInvRadiusMin, 1.0 / bridgeRadiusMax2S), alpaka::math::max(acc, bridgeInvRadiusMax, 1.0 / bridgeRadiusMin2S)); - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool matchRadiiEEEEE(TAcc const& acc, @@ -1009,7 +1009,7 @@ namespace lst { alpaka::math::max(acc, innerInvRadiusMax, 1.0 / innerRadiusMin2S), alpaka::math::min(acc, bridgeInvRadiusMin, 1.0 / bridgeRadiusMax2S), alpaka::math::max(acc, bridgeInvRadiusMax, 1.0 / bridgeRadiusMin2S)); - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE void computeSigmasForRegression(TAcc const& acc, @@ -1096,7 +1096,7 @@ namespace lst { #endif } } - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE float computeRadiusUsingRegression(TAcc const& acc, @@ -1194,7 +1194,7 @@ namespace lst { (xs[i] * xs[i] + ys[i] * ys[i] - twoG * xs[i] - twoF * ys[i] + c) / sigmas2[i]; } return radius; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE float computeChiSquared(TAcc const& acc, @@ -1240,7 +1240,7 @@ namespace lst { (xs[i] * xs[i] + ys[i] * ys[i] - 2 * g * xs[i] - 2 * f * ys[i] + c) / sigma2; } return chiSquared; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE void runDeltaBetaIterationsT5(TAcc const& acc, @@ -1346,7 +1346,7 @@ namespace lst { //2nd update pt_beta = dr * lst::k2Rinv1GeVf / alpaka::math::sin(acc, betaAv); //get a better pt estimate } - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runQuintupletDefaultAlgoBBBB(TAcc const& acc, @@ -1598,7 +1598,7 @@ namespace lst { float dBeta = betaIn - betaOut; return dBeta * dBeta <= dBetaCut2; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runQuintupletDefaultAlgoBBEE(TAcc const& acc, @@ -1848,7 +1848,7 @@ namespace lst { float dBeta = betaIn - betaOut; //Cut #7: Cut on dBet return dBeta * dBeta <= dBetaCut2; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runQuintupletDefaultAlgoEEEE(TAcc const& acc, @@ -2077,7 +2077,7 @@ namespace lst { float dBeta = betaIn - betaOut; //Cut #7: Cut on dBeta return dBeta * dBeta <= dBetaCut2; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runQuintupletAlgoSelector(TAcc const& acc, @@ -2182,7 +2182,7 @@ namespace lst { } return false; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runQuintupletDefaultAlgo(TAcc const& acc, @@ -2533,7 +2533,7 @@ namespace lst { regressionF, regressionRadius); return true; - }; + } struct createQuintupletsInGPUv2 { template diff --git a/RecoTracker/LSTCore/src/alpaka/Segment.h b/RecoTracker/LSTCore/src/alpaka/Segment.h index 6e79bacfa4902..3468a40acc3c0 100644 --- a/RecoTracker/LSTCore/src/alpaka/Segment.h +++ b/RecoTracker/LSTCore/src/alpaka/Segment.h @@ -190,7 +190,7 @@ namespace lst { return (subdet == Barrel) && (((side != Center) && (layer == 3)) || ((side == NegZ) && (((layer == 2) && (rod > 5)) || ((layer == 1) && (rod > 9)))) || ((side == PosZ) && (((layer == 2) && (rod < 8)) || ((layer == 1) && (rod < 4))))); - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE float isTighterTiltedModules_seg(short subdet, short layer, short side, short rod) { // The "tighter" tilted modules are the subset of tilted modules that have smaller spacing @@ -199,7 +199,7 @@ namespace lst { return (subdet == Barrel) && (((side != Center) && (layer == 3)) || ((side == NegZ) && (((layer == 2) && (rod > 5)) || ((layer == 1) && (rod > 9)))) || ((side == PosZ) && (((layer == 2) && (rod < 8)) || ((layer == 1) && (rod < 4))))); - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize_seg(short layer, short ring, short subdet, short side, short rod) { static constexpr float miniDeltaTilted[3] = {0.26f, 0.26f, 0.26f}; @@ -229,7 +229,7 @@ namespace lst { } return moduleSeparation; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize_seg(lst::Modules const& modulesInGPU, unsigned int moduleIndex) { static constexpr float miniDeltaTilted[3] = {0.26f, 0.26f, 0.26f}; @@ -261,7 +261,7 @@ namespace lst { } return moduleSeparation; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE void dAlphaThreshold(TAcc const& acc, @@ -356,7 +356,7 @@ namespace lst { //Inner to outer dAlphaThresholdValues[2] = dAlpha_Bfield + alpaka::math::sqrt(acc, dAlpha_res * dAlpha_res + sdMuls * sdMuls); - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE void addSegmentToMemory(lst::Segments& segmentsInGPU, unsigned int lowerMDIndex, @@ -448,7 +448,7 @@ namespace lst { segmentsInGPU.circleCenterX[pixelSegmentArrayIndex] = candidateCenterXs[bestIndex]; segmentsInGPU.circleCenterY[pixelSegmentArrayIndex] = candidateCenterYs[bestIndex]; segmentsInGPU.circleRadius[pixelSegmentArrayIndex] = circleRadius; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runSegmentDefaultAlgoBarrel(TAcc const& acc, @@ -538,7 +538,7 @@ namespace lst { if (alpaka::math::abs(acc, dAlphaOuterMDSegment) >= dAlphaOuterMDSegmentThreshold) return false; return alpaka::math::abs(acc, dAlphaInnerMDOuterMD) < dAlphaInnerMDOuterMDThreshold; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runSegmentDefaultAlgoEndcap(TAcc const& acc, @@ -654,7 +654,7 @@ namespace lst { if (alpaka::math::abs(acc, dAlphaOuterMDSegment) >= dAlphaOuterMDSegmentThreshold) return false; return alpaka::math::abs(acc, dAlphaInnerMDOuterMD) < dAlphaInnerMDOuterMDThreshold; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runSegmentDefaultAlgo(TAcc const& acc, @@ -700,7 +700,7 @@ namespace lst { dPhiChangeMin, dPhiChangeMax); } - }; + } struct createSegmentsInGPUv2 { template diff --git a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h index ede4dd9471e8e..dbf5cf24f6d55 100644 --- a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h +++ b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h @@ -126,7 +126,7 @@ namespace lst { trackCandidatesInGPU.hitIndices[Params_pT5::kHits * trackCandidateIndex + 1] = hitIndices.z; trackCandidatesInGPU.hitIndices[Params_pT5::kHits * trackCandidateIndex + 2] = hitIndices.y; trackCandidatesInGPU.hitIndices[Params_pT5::kHits * trackCandidateIndex + 3] = hitIndices.w; - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE void addTrackCandidateToMemory(lst::TrackCandidates& trackCandidatesInGPU, short trackCandidateType, @@ -163,7 +163,7 @@ namespace lst { trackCandidatesInGPU.centerX[trackCandidateIndex] = __F2H(centerX); trackCandidatesInGPU.centerY[trackCandidateIndex] = __F2H(centerY); trackCandidatesInGPU.radius[trackCandidateIndex] = __F2H(radius); - }; + } ALPAKA_FN_ACC ALPAKA_FN_INLINE int checkPixelHits(unsigned int ix, unsigned int jx, @@ -203,7 +203,7 @@ namespace lst { npMatched++; } return npMatched; - }; + } struct crossCleanpT3 { template diff --git a/RecoTracker/LSTCore/src/alpaka/Triplet.h b/RecoTracker/LSTCore/src/alpaka/Triplet.h index f5a216724c1da..9f3521e712ed6 100644 --- a/RecoTracker/LSTCore/src/alpaka/Triplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Triplet.h @@ -202,7 +202,7 @@ namespace lst { tripletsInGPU.rtOut[tripletIndex] = rtOut; tripletsInGPU.betaInCut[tripletIndex] = betaInCut; #endif - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passRZConstraint(TAcc const& acc, @@ -262,7 +262,7 @@ namespace lst { } else { return alpaka::math::abs(acc, residual) < 5; } - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passPointingConstraintBBB(TAcc const& acc, @@ -361,7 +361,7 @@ namespace lst { //Cut #3: first beta cut return alpaka::math::abs(acc, betaIn) < betaInCut; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passPointingConstraintBBE(TAcc const& acc, @@ -482,7 +482,7 @@ namespace lst { //Cut #4: first beta cut return alpaka::math::abs(acc, betaInRHmin) < betaInCut; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passPointingConstraintEEE(TAcc const& acc, @@ -605,7 +605,7 @@ namespace lst { //Cut #4: first beta cut return alpaka::math::abs(acc, betaInRHmin) < betaInCut; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool passPointingConstraint(TAcc const& acc, @@ -707,7 +707,7 @@ namespace lst { betaInCut); } return false; // failsafe - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE float computeRadiusFromThreeAnchorHits( @@ -740,7 +740,7 @@ namespace lst { radius = alpaka::math::sqrt(acc, g * g + f * f - c); return radius; - }; + } template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runTripletConstraintsAndAlgo(TAcc const& acc, @@ -806,7 +806,7 @@ namespace lst { circleRadius = computeRadiusFromThreeAnchorHits(acc, x1, y1, x2, y2, x3, y3, circleCenterX, circleCenterY); return true; - }; + } struct createTripletsInGPUv2 { template