diff --git a/RecoTracker/LSTCore/interface/Module.h b/RecoTracker/LSTCore/interface/Module.h index 56c560eaba04c..d45415f800a4f 100644 --- a/RecoTracker/LSTCore/interface/Module.h +++ b/RecoTracker/LSTCore/interface/Module.h @@ -37,7 +37,7 @@ namespace lst { const bool* isAnchor; const ModuleType* moduleType; const ModuleLayerType* moduleLayerType; - const int* sdlLayers; + const int* lstLayers; const unsigned int* connectedPixels; static bool parseIsInverted(short subdet, short side, short module, short layer) { @@ -108,7 +108,7 @@ namespace lst { isAnchor = alpaka::getPtrNative(buf.isAnchor_buf); moduleType = alpaka::getPtrNative(buf.moduleType_buf); moduleLayerType = alpaka::getPtrNative(buf.moduleLayerType_buf); - sdlLayers = alpaka::getPtrNative(buf.sdlLayers_buf); + lstLayers = alpaka::getPtrNative(buf.lstLayers_buf); connectedPixels = alpaka::getPtrNative(buf.connectedPixels_buf); } }; @@ -139,7 +139,7 @@ namespace lst { Buf isAnchor_buf; Buf moduleType_buf; Buf moduleLayerType_buf; - Buf sdlLayers_buf; + Buf lstLayers_buf; Buf connectedPixels_buf; Modules data_; @@ -169,7 +169,7 @@ namespace lst { isAnchor_buf(allocBufWrapper(dev, nMod)), moduleType_buf(allocBufWrapper(dev, nMod)), moduleLayerType_buf(allocBufWrapper(dev, nMod)), - sdlLayers_buf(allocBufWrapper(dev, nMod)), + lstLayers_buf(allocBufWrapper(dev, nMod)), connectedPixels_buf(allocBufWrapper(dev, nPixs)) { data_.setData(*this); } @@ -209,7 +209,7 @@ namespace lst { alpaka::memcpy(queue, moduleType_buf, src.moduleType_buf); if (isFull) { alpaka::memcpy(queue, moduleLayerType_buf, src.moduleLayerType_buf); - alpaka::memcpy(queue, sdlLayers_buf, src.sdlLayers_buf); + alpaka::memcpy(queue, lstLayers_buf, src.lstLayers_buf); alpaka::memcpy(queue, connectedPixels_buf, src.connectedPixels_buf); } alpaka::wait(queue); diff --git a/RecoTracker/LSTCore/src/ModuleMethods.h b/RecoTracker/LSTCore/src/ModuleMethods.h index 4faf61ac0048b..9693a464fcf1a 100644 --- a/RecoTracker/LSTCore/src/ModuleMethods.h +++ b/RecoTracker/LSTCore/src/ModuleMethods.h @@ -250,7 +250,7 @@ namespace lst { auto dxdys_buf = allocBufWrapper(devHost, nModules); auto drdzs_buf = allocBufWrapper(devHost, nModules); auto partnerModuleIndices_buf = allocBufWrapper(devHost, nModules); - auto sdlLayers_buf = allocBufWrapper(devHost, nModules); + auto lstLayers_buf = allocBufWrapper(devHost, nModules); // Getting the underlying data pointers unsigned int* host_detIds = alpaka::getPtrNative(detIds_buf); @@ -270,7 +270,7 @@ namespace lst { float* host_dxdys = alpaka::getPtrNative(dxdys_buf); float* host_drdzs = alpaka::getPtrNative(drdzs_buf); uint16_t* host_partnerModuleIndices = alpaka::getPtrNative(partnerModuleIndices_buf); - int* host_sdlLayers = alpaka::getPtrNative(sdlLayers_buf); + int* host_lstLayers = alpaka::getPtrNative(lstLayers_buf); //reassign detIdToIndex indices here nLowerModules = (nModules - 1) / 2; @@ -351,7 +351,7 @@ namespace lst { host_drdzs[index] = (subdet == Barrel) ? tiltedGeometry->getDrDz(detId) : 0; } - host_sdlLayers[index] = + host_lstLayers[index] = layer + 6 * (subdet == lst::Endcap) + 5 * (subdet == lst::Endcap and host_moduleType[index] == lst::TwoS); } @@ -402,7 +402,7 @@ namespace lst { alpaka::memcpy(queue, modulesBuf->dxdys_buf, dxdys_buf); alpaka::memcpy(queue, modulesBuf->drdzs_buf, drdzs_buf); alpaka::memcpy(queue, modulesBuf->partnerModuleIndices_buf, partnerModuleIndices_buf); - alpaka::memcpy(queue, modulesBuf->sdlLayers_buf, sdlLayers_buf); + alpaka::memcpy(queue, modulesBuf->lstLayers_buf, lstLayers_buf); alpaka::wait(queue); fillConnectedModuleArrayExplicit(modulesBuf.get(), nModules, queue, mmd, moduleConnectionMap); diff --git a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc index b2fa20e03fae9..400d35351fa62 100644 --- a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc +++ b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc @@ -1623,7 +1623,7 @@ lst::TripletsBuffer* lst::Event::getTriplets() { alpaka::memcpy(queue, tripletsInCPU->zHi_buf, tripletsBuffers->zHi_buf, nMemHost); alpaka::memcpy(queue, tripletsInCPU->zLoPointed_buf, tripletsBuffers->zLoPointed_buf, nMemHost); alpaka::memcpy(queue, tripletsInCPU->zHiPointed_buf, tripletsBuffers->zHiPointed_buf, nMemHost); - alpaka::memcpy(queue, tripletsInCPU->sdlCut_buf, tripletsBuffers->sdlCut_buf, nMemHost); + alpaka::memcpy(queue, tripletsInCPU->lstCut_buf, tripletsBuffers->lstCut_buf, nMemHost); alpaka::memcpy(queue, tripletsInCPU->betaInCut_buf, tripletsBuffers->betaInCut_buf, nMemHost); alpaka::memcpy(queue, tripletsInCPU->rtLo_buf, tripletsBuffers->rtLo_buf, nMemHost); alpaka::memcpy(queue, tripletsInCPU->rtHi_buf, tripletsBuffers->rtHi_buf, nMemHost); diff --git a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h index 3e6ad10c53fcf..bf23e8bc7f759 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h @@ -1184,7 +1184,7 @@ namespace lst { unsigned int secondMDIndex, unsigned int thirdMDIndex, unsigned int fourthMDIndex) { - float dPhi, betaIn, betaOut, pt_beta, zLo, zHi, zLoPointed, zHiPointed, sdlCut, betaOutCut; + float dPhi, betaIn, betaOut, pt_beta, zLo, zHi, zLoPointed, zHiPointed, lstCut, betaOutCut; bool isPS_OutLo = (modulesInGPU.moduleType[outerInnerLowerModuleIndex] == lst::PS); @@ -1249,14 +1249,14 @@ namespace lst { float drt_InSeg = rt_InOut - rt_InLo; - const float sdlThetaMulsF2 = + const float lstThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InUp) / 50.f) * (r3_InUp / rt_InUp); - const float sdlMuls2 = sdlThetaMulsF2 * 9.f / (ptCut * ptCut) * 16.f; + const float lstMuls2 = lstThetaMulsF2 * 9.f / (ptCut * ptCut) * 16.f; float dzErr = (drt_OutLo_InUp * drt_OutLo_InUp) * (etaErr * etaErr) * cosh2Eta; dzErr += 0.03f * 0.03f; // Approximately account for IT module size dzErr *= 9.f; // 3 sigma - dzErr += sdlMuls2 * (drt_OutLo_InUp * drt_OutLo_InUp) / 3.f * cosh2Eta; + dzErr += lstMuls2 * (drt_OutLo_InUp * drt_OutLo_InUp) / 3.f * cosh2Eta; dzErr += zGeom * zGeom; dzErr = alpaka::math::sqrt(acc, dzErr); @@ -1272,8 +1272,8 @@ namespace lst { if ((z_OutLo < zLoPointed) || (z_OutLo > zHiPointed)) return false; - const float sdlPVoff = 0.1f / rt_OutLo; - sdlCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, sdlMuls2 + sdlPVoff * sdlPVoff); + const float lstPVoff = 0.1f / rt_OutLo; + lstCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, lstMuls2 + lstPVoff * lstPVoff); //no dphipos cut float midPointX = 0.5f * (x_InLo + x_OutLo); @@ -1284,7 +1284,7 @@ namespace lst { dPhi = lst::deltaPhi(acc, midPointX, midPointY, diffX, diffY); - if (alpaka::math::abs(acc, dPhi) > sdlCut) + if (alpaka::math::abs(acc, dPhi) > lstCut) return false; //lots of array accesses below this... @@ -1380,7 +1380,7 @@ namespace lst { float min_ptBeta_ptBetaMax = alpaka::math::min( acc, alpaka::math::abs(acc, pt_beta), lst::kPt_betaMax); //need to confirm the range-out value of 7 GeV - const float dBetaMuls2 = sdlThetaMulsF2 * 16.f / (min_ptBeta_ptBetaMax * min_ptBeta_ptBetaMax); + const float dBetaMuls2 = lstThetaMulsF2 * 16.f / (min_ptBeta_ptBetaMax * min_ptBeta_ptBetaMax); const float alphaInAbsReg = alpaka::math::max(acc, alpaka::math::abs(acc, alpha_InLo), @@ -1442,7 +1442,7 @@ namespace lst { unsigned int secondMDIndex, unsigned int thirdMDIndex, unsigned int fourthMDIndex) { - float dPhi, betaIn, betaOut, pt_beta, rtLo, rtHi, sdlCut, betaOutCut; + float dPhi, betaIn, betaOut, pt_beta, rtLo, rtHi, lstCut, betaOutCut; bool isPS_OutLo = (modulesInGPU.moduleType[outerInnerLowerModuleIndex] == lst::PS); @@ -1484,9 +1484,9 @@ namespace lst { float zpitch_OutLo = (isPS_OutLo ? kPixelPSZpitch : kStrip2SZpitch); float zGeom = zpitch_InLo + zpitch_OutLo; - const float sdlSlope = + const float lstSlope = alpaka::math::asin(acc, alpaka::math::min(acc, rt_OutLo * k2Rinv1GeVf / ptCut, kSinAlphaMax)); - const float dzDrtScale = alpaka::math::tan(acc, sdlSlope) / sdlSlope; //FIXME: need approximate value + const float dzDrtScale = alpaka::math::tan(acc, lstSlope) / lstSlope; //FIXME: need approximate value const float dLum = alpaka::math::copysign(acc, kDeltaZLum, z_InUp); bool isOutSgInnerMDPS = modulesInGPU.moduleType[outerInnerLowerModuleIndex] == lst::PS; @@ -1511,14 +1511,14 @@ namespace lst { const float cosh2Eta = 1.f + (pz * pz) / (ptIn * ptIn); const float multDzDr2 = (dzOutInAbs * dzOutInAbs) * cosh2Eta / ((cosh2Eta - 1.f) * (cosh2Eta - 1.f)); const float r3_InUp = alpaka::math::sqrt(acc, z_InUp * z_InUp + rt_InUp * rt_InUp); - const float sdlThetaMulsF2 = + const float lstThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InUp) / 50.f) * (r3_InUp / rt_InUp); - const float sdlMuls2 = sdlThetaMulsF2 * 9.f / (ptCut * ptCut) * 16.f; + const float lstMuls2 = lstThetaMulsF2 * 9.f / (ptCut * ptCut) * 16.f; float drtErr = (etaErr * etaErr) * multDzDr2; drtErr += 0.03f * 0.03f; // Approximately account for IT module size drtErr *= 9.f; // 3 sigma - drtErr += sdlMuls2 * multDzDr2 / 3.f * cosh2Eta; + drtErr += lstMuls2 * multDzDr2 / 3.f * cosh2Eta; drtErr = alpaka::math::sqrt(acc, drtErr); const float drtDzIn = alpaka::math::abs(acc, ptIn / pz); @@ -1537,8 +1537,8 @@ namespace lst { const float alpha1GeV_OutLo = alpaka::math::asin(acc, alpaka::math::min(acc, rt_OutLo * k2Rinv1GeVf / ptCut, kSinAlphaMax)); - const float sdlPVoff = 0.1f / rt_OutLo; - sdlCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, sdlMuls2 + sdlPVoff * sdlPVoff); + const float lstPVoff = 0.1f / rt_OutLo; + lstCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, lstMuls2 + lstPVoff * lstPVoff); float midPointX = 0.5f * (x_InLo + x_OutLo); float midPointY = 0.5f * (y_InLo + y_OutLo); @@ -1549,7 +1549,7 @@ namespace lst { dPhi = lst::deltaPhi(acc, midPointX, midPointY, diffX, diffY); // Cut #5: deltaPhiChange - if (alpaka::math::abs(acc, dPhi) > sdlCut) + if (alpaka::math::abs(acc, dPhi) > lstCut) return false; float alpha_InLo = __H2F(segmentsInGPU.dPhiChanges[innerSegmentIndex]); @@ -1640,7 +1640,7 @@ namespace lst { float min_ptBeta_ptBetaMax = alpaka::math::min( acc, alpaka::math::abs(acc, pt_beta), lst::kPt_betaMax); //need to confirm the range-out value of 7 GeV - const float dBetaMuls2 = sdlThetaMulsF2 * 16.f / (min_ptBeta_ptBetaMax * min_ptBeta_ptBetaMax); + const float dBetaMuls2 = lstThetaMulsF2 * 16.f / (min_ptBeta_ptBetaMax * min_ptBeta_ptBetaMax); const float alphaInAbsReg = alpaka::math::max(acc, diff --git a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h index 66061ae427849..d8dd0df8b745e 100644 --- a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h @@ -238,12 +238,12 @@ namespace lst { uint16_t lowerModuleIndex4, uint16_t lowerModuleIndex5, float chiSquared) { - // Using sdlLayer numbering convention defined in ModuleMethods.h - const int layer1 = modulesInGPU.sdlLayers[lowerModuleIndex1]; - const int layer2 = modulesInGPU.sdlLayers[lowerModuleIndex2]; - const int layer3 = modulesInGPU.sdlLayers[lowerModuleIndex3]; - const int layer4 = modulesInGPU.sdlLayers[lowerModuleIndex4]; - const int layer5 = modulesInGPU.sdlLayers[lowerModuleIndex5]; + // Using lstLayer numbering convention defined in ModuleMethods.h + const int layer1 = modulesInGPU.lstLayers[lowerModuleIndex1]; + const int layer2 = modulesInGPU.lstLayers[lowerModuleIndex2]; + const int layer3 = modulesInGPU.lstLayers[lowerModuleIndex3]; + const int layer4 = modulesInGPU.lstLayers[lowerModuleIndex4]; + const int layer5 = modulesInGPU.lstLayers[lowerModuleIndex5]; if (layer1 == 7 and layer2 == 8 and layer3 == 9) { if (layer4 == 10 and layer5 == 11) { @@ -347,12 +347,12 @@ namespace lst { const float& z4 = mdsInGPU.anchorZ[fourthMDIndex] / 100; const float& z5 = mdsInGPU.anchorZ[fifthMDIndex] / 100; - // Using sdl_layer numbering convention defined in ModuleMethods.h - const int layer1 = modulesInGPU.sdlLayers[lowerModuleIndex1]; - const int layer2 = modulesInGPU.sdlLayers[lowerModuleIndex2]; - const int layer3 = modulesInGPU.sdlLayers[lowerModuleIndex3]; - const int layer4 = modulesInGPU.sdlLayers[lowerModuleIndex4]; - const int layer5 = modulesInGPU.sdlLayers[lowerModuleIndex5]; + // Using lst_layer numbering convention defined in ModuleMethods.h + const int layer1 = modulesInGPU.lstLayers[lowerModuleIndex1]; + const int layer2 = modulesInGPU.lstLayers[lowerModuleIndex2]; + const int layer3 = modulesInGPU.lstLayers[lowerModuleIndex3]; + const int layer4 = modulesInGPU.lstLayers[lowerModuleIndex4]; + const int layer5 = modulesInGPU.lstLayers[lowerModuleIndex5]; //slope computed using the internal T3s const int moduleType1 = modulesInGPU.moduleType[lowerModuleIndex1]; //0 is ps, 1 is 2s @@ -1400,10 +1400,10 @@ namespace lst { float coshEta = dr3_InSeg / drt_InSeg; float dzErr = (zpitch_InLo + zpitch_OutLo) * (zpitch_InLo + zpitch_OutLo) * 2.f; - float sdlThetaMulsF2 = + float lstThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InLo) / 50.f) * (r3_InLo / rt_InLo); - float sdlMuls2 = sdlThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; - dzErr += sdlMuls2 * drt_OutLo_InLo * drt_OutLo_InLo / 3.f * coshEta * coshEta; + float lstMuls2 = lstThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + dzErr += lstMuls2 * drt_OutLo_InLo * drt_OutLo_InLo / 3.f * coshEta * coshEta; dzErr = alpaka::math::sqrt(acc, dzErr); // Constructing upper and lower bound @@ -1418,12 +1418,12 @@ namespace lst { if ((z_OutLo < zLoPointed) || (z_OutLo > zHiPointed)) return false; - float sdlPVoff = 0.1f / rt_OutLo; - float sdlCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, sdlMuls2 + sdlPVoff * sdlPVoff); + float lstPVoff = 0.1f / rt_OutLo; + float lstCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, lstMuls2 + lstPVoff * lstPVoff); float deltaPhiPos = lst::phi_mpi_pi(acc, mdsInGPU.anchorPhi[fourthMDIndex] - mdsInGPU.anchorPhi[secondMDIndex]); // Cut #3: FIXME:deltaPhiPos can be tighter - if (alpaka::math::abs(acc, deltaPhiPos) > sdlCut) + if (alpaka::math::abs(acc, deltaPhiPos) > lstCut) return false; float midPointX = 0.5f * (mdsInGPU.anchorX[firstMDIndex] + mdsInGPU.anchorX[thirdMDIndex]); @@ -1434,7 +1434,7 @@ namespace lst { float dPhi = lst::deltaPhi(acc, midPointX, midPointY, diffX, diffY); // Cut #4: deltaPhiChange - if (alpaka::math::abs(acc, dPhi) > sdlCut) + if (alpaka::math::abs(acc, dPhi) > lstCut) return false; // First obtaining the raw betaIn and betaOut values without any correction and just purely based on the mini-doublet hit positions @@ -1549,7 +1549,7 @@ namespace lst { float min_ptBeta_maxPtBeta = alpaka::math::min( acc, alpaka::math::abs(acc, pt_beta), lst::kPt_betaMax); //need to confimm the range-out value of 7 GeV - const float dBetaMuls2 = sdlThetaMulsF2 * 16.f / (min_ptBeta_maxPtBeta * min_ptBeta_maxPtBeta); + const float dBetaMuls2 = lstThetaMulsF2 * 16.f / (min_ptBeta_maxPtBeta * min_ptBeta_maxPtBeta); const float alphaInAbsReg = alpaka::math::max( acc, @@ -1673,23 +1673,23 @@ namespace lst { float kZ = (z_OutLo - z_InLo) / dzSDIn; float drtErr = zGeom1_another * zGeom1_another * drtSDIn * drtSDIn / dzSDIn / dzSDIn * (1.f - 2.f * kZ + 2.f * kZ * kZ); - const float sdlThetaMulsF2 = + const float lstThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InLo) / 50.f) * (rIn / rt_InLo); - const float sdlMuls2 = sdlThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; - drtErr += sdlMuls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta; + const float lstMuls2 = lstThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + drtErr += lstMuls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta; drtErr = alpaka::math::sqrt(acc, drtErr); //Cut #3: rt-z pointed if ((kZ < 0) || (rtOut < rtLo) || (rtOut > rtHi)) return false; - const float sdlPVoff = 0.1f / rt_OutLo; - float sdlCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, sdlMuls2 + sdlPVoff * sdlPVoff); + const float lstPVoff = 0.1f / rt_OutLo; + float lstCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, lstMuls2 + lstPVoff * lstPVoff); float deltaPhiPos = lst::phi_mpi_pi(acc, mdsInGPU.anchorPhi[fourthMDIndex] - mdsInGPU.anchorPhi[secondMDIndex]); //Cut #4: deltaPhiPos can be tighter - if (alpaka::math::abs(acc, deltaPhiPos) > sdlCut) + if (alpaka::math::abs(acc, deltaPhiPos) > lstCut) return false; float midPointX = 0.5f * (mdsInGPU.anchorX[firstMDIndex] + mdsInGPU.anchorX[thirdMDIndex]); @@ -1699,7 +1699,7 @@ namespace lst { float dPhi = lst::deltaPhi(acc, midPointX, midPointY, diffX, diffY); // Cut #5: deltaPhiChange - if (alpaka::math::abs(acc, dPhi) > sdlCut) + if (alpaka::math::abs(acc, dPhi) > lstCut) return false; float sdIn_alpha = __H2F(segmentsInGPU.dPhiChanges[innerSegmentIndex]); @@ -1802,7 +1802,7 @@ namespace lst { float min_ptBeta_maxPtBeta = alpaka::math::min( acc, alpaka::math::abs(acc, pt_beta), lst::kPt_betaMax); //need to confirm the range-out value of 7 GeV - const float dBetaMuls2 = sdlThetaMulsF2 * 16.f / (min_ptBeta_maxPtBeta * min_ptBeta_maxPtBeta); + const float dBetaMuls2 = lstThetaMulsF2 * 16.f / (min_ptBeta_maxPtBeta * min_ptBeta_maxPtBeta); const float alphaInAbsReg = alpaka::math::max( acc, @@ -1914,14 +1914,14 @@ namespace lst { float multDzDr = dzOutInAbs * coshEta / (coshEta * coshEta - 1.f); float kZ = (z_OutLo - z_InLo) / dzSDIn; - float sdlThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InLo) / 50.f); + float lstThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InLo) / 50.f); - float sdlMuls2 = sdlThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + float lstMuls2 = lstThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; float drtErr = alpaka::math::sqrt( acc, lst::kPixelPSZpitch * lst::kPixelPSZpitch * 2.f / (dzSDIn * dzSDIn) * (dzOutInAbs * dzOutInAbs) + - sdlMuls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta); + lstMuls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta); float drtMean = drtSDIn * dzOutInAbs / alpaka::math::abs(acc, dzSDIn); float rtWindow = drtErr + rtGeom; @@ -1937,12 +1937,12 @@ namespace lst { return false; } - float sdlPVoff = 0.1f / rtOut; - float sdlCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, sdlMuls2 + sdlPVoff * sdlPVoff); + float lstPVoff = 0.1f / rtOut; + float lstCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, lstMuls2 + lstPVoff * lstPVoff); float deltaPhiPos = lst::phi_mpi_pi(acc, mdsInGPU.anchorPhi[fourthMDIndex] - mdsInGPU.anchorPhi[secondMDIndex]); - if (alpaka::math::abs(acc, deltaPhiPos) > sdlCut) + if (alpaka::math::abs(acc, deltaPhiPos) > lstCut) return false; float midPointX = 0.5f * (mdsInGPU.anchorX[firstMDIndex] + mdsInGPU.anchorX[thirdMDIndex]); @@ -1953,7 +1953,7 @@ namespace lst { float dPhi = lst::deltaPhi(acc, midPointX, midPointY, diffX, diffY); // Cut #5: deltaPhiChange - if (alpaka::math::abs(acc, dPhi) > sdlCut) + if (alpaka::math::abs(acc, dPhi) > lstCut) return false; float sdIn_alpha = __H2F(segmentsInGPU.dPhiChanges[innerSegmentIndex]); @@ -2043,7 +2043,7 @@ namespace lst { float min_ptBeta_maxPtBeta = alpaka::math::min( acc, alpaka::math::abs(acc, pt_beta), lst::kPt_betaMax); //need to confirm the range-out value of 7 GeV - const float dBetaMuls2 = sdlThetaMulsF2 * 16.f / (min_ptBeta_maxPtBeta * min_ptBeta_maxPtBeta); + const float dBetaMuls2 = lstThetaMulsF2 * 16.f / (min_ptBeta_maxPtBeta * min_ptBeta_maxPtBeta); const float alphaInAbsReg = alpaka::math::max( acc, diff --git a/RecoTracker/LSTCore/src/alpaka/Triplet.h b/RecoTracker/LSTCore/src/alpaka/Triplet.h index b22449a7c61ff..3d462ffce88e5 100644 --- a/RecoTracker/LSTCore/src/alpaka/Triplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Triplet.h @@ -82,7 +82,7 @@ namespace lst { Buf zHi_buf; Buf zLoPointed_buf; Buf zHiPointed_buf; - Buf sdlCut_buf; + Buf lstCut_buf; Buf betaInCut_buf; Buf rtLo_buf; Buf rtHi_buf; @@ -116,7 +116,7 @@ namespace lst { zHi_buf(allocBufWrapper(devAccIn, maxTriplets, queue)), zLoPointed_buf(allocBufWrapper(devAccIn, maxTriplets, queue)), zHiPointed_buf(allocBufWrapper(devAccIn, maxTriplets, queue)), - sdlCut_buf(allocBufWrapper(devAccIn, maxTriplets, queue)), + lstCut_buf(allocBufWrapper(devAccIn, maxTriplets, queue)), betaInCut_buf(allocBufWrapper(devAccIn, maxTriplets, queue)), rtLo_buf(allocBufWrapper(devAccIn, maxTriplets, queue)), rtHi_buf(allocBufWrapper(devAccIn, maxTriplets, queue)) @@ -222,10 +222,10 @@ namespace lst { const float& z2 = mdsInGPU.anchorZ[secondMDIndex]; const float& z3 = mdsInGPU.anchorZ[thirdMDIndex]; - // Using sdl_layer numbering convention defined in ModuleMethods.h - const int layer1 = modulesInGPU.sdlLayers[innerInnerLowerModuleIndex]; - const int layer2 = modulesInGPU.sdlLayers[middleLowerModuleIndex]; - const int layer3 = modulesInGPU.sdlLayers[outerOuterLowerModuleIndex]; + // Using lst_layer numbering convention defined in ModuleMethods.h + const int layer1 = modulesInGPU.lstLayers[innerInnerLowerModuleIndex]; + const int layer2 = modulesInGPU.lstLayers[middleLowerModuleIndex]; + const int layer3 = modulesInGPU.lstLayers[outerOuterLowerModuleIndex]; const float residual = z2 - ((z3 - z1) / (r3 - r1) * (r2 - r1) + z1); @@ -317,9 +317,9 @@ namespace lst { float coshEta = dr3_InSeg / drt_InSeg; float dzErr = (zpitchIn + zpitchOut) * (zpitchIn + zpitchOut) * 2.f; - float sdlThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rtOut - rtIn) / 50.f) * (r3In / rtIn); - float sdlMuls2 = sdlThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; - dzErr += sdlMuls2 * drt_OutIn * drt_OutIn / 3.f * coshEta * coshEta; + float lstThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rtOut - rtIn) / 50.f) * (r3In / rtIn); + float lstMuls2 = lstThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + dzErr += lstMuls2 * drt_OutIn * drt_OutIn / 3.f * coshEta * coshEta; dzErr = alpaka::math::sqrt(acc, dzErr); // Constructing upper and lower bound @@ -435,9 +435,9 @@ namespace lst { const float kZ = (zOut - zIn) / dzSDIn; float drtErr = zGeom1_another * zGeom1_another * drtSDIn * drtSDIn / dzSDIn / dzSDIn * (1.f - 2.f * kZ + 2.f * kZ * kZ); - const float sdlThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2 * (rtOut - rtIn) / 50.f) * (rIn / rtIn); - const float sdlMuls2 = sdlThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; - drtErr += sdlMuls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta; + const float lstThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2 * (rtOut - rtIn) / 50.f) * (rIn / rtIn); + const float lstMuls2 = lstThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + drtErr += lstMuls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta; drtErr = alpaka::math::sqrt(acc, drtErr); //Cut #3: rt-z pointed @@ -545,14 +545,14 @@ namespace lst { float multDzDr = dzOutInAbs * coshEta / (coshEta * coshEta - 1.f); float kZ = (zOut - zIn) / dzSDIn; - float sdlThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rtOut - rtIn) / 50.f); + float lstThetaMulsF2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rtOut - rtIn) / 50.f); - float sdlMuls2 = sdlThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + float lstMuls2 = lstThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; float drtErr = alpaka::math::sqrt( acc, lst::kPixelPSZpitch * lst::kPixelPSZpitch * 2.f / (dzSDIn * dzSDIn) * (dzOutInAbs * dzOutInAbs) + - sdlMuls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta); + lstMuls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta); float drtMean = drtSDIn * dzOutInAbs / alpaka::math::abs(acc, dzSDIn); float rtWindow = drtErr + rtGeom;