diff --git a/RecoTracker/LST/BuildFile.xml b/RecoTracker/LST/BuildFile.xml index 09ddabd9727ba..07a6ae1d26eaf 100644 --- a/RecoTracker/LST/BuildFile.xml +++ b/RecoTracker/LST/BuildFile.xml @@ -3,7 +3,6 @@ - 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..efdb099bfea0c 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->dPhiCut_buf, tripletsBuffers->dPhiCut_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..3b6faffbce426 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, dPhiCut, 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 thetaMuls2 = (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 muls2 = thetaMuls2 * 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 += muls2 * (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 pvOffset = 0.1f / rt_OutLo; + dPhiCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, muls2 + pvOffset * pvOffset); //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) > dPhiCut) 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 = thetaMuls2 * 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, dPhiCut, betaOutCut; bool isPS_OutLo = (modulesInGPU.moduleType[outerInnerLowerModuleIndex] == lst::PS); @@ -1484,9 +1484,8 @@ namespace lst { float zpitch_OutLo = (isPS_OutLo ? kPixelPSZpitch : kStrip2SZpitch); float zGeom = zpitch_InLo + zpitch_OutLo; - const float sdlSlope = - 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 slope = alpaka::math::asin(acc, alpaka::math::min(acc, rt_OutLo * k2Rinv1GeVf / ptCut, kSinAlphaMax)); + const float dzDrtScale = alpaka::math::tan(acc, slope) / slope; //FIXME: need approximate value const float dLum = alpaka::math::copysign(acc, kDeltaZLum, z_InUp); bool isOutSgInnerMDPS = modulesInGPU.moduleType[outerInnerLowerModuleIndex] == lst::PS; @@ -1511,14 +1510,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 thetaMuls2 = (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 muls2 = thetaMuls2 * 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 += muls2 * multDzDr2 / 3.f * cosh2Eta; drtErr = alpaka::math::sqrt(acc, drtErr); const float drtDzIn = alpaka::math::abs(acc, ptIn / pz); @@ -1537,8 +1536,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 pvOffset = 0.1f / rt_OutLo; + dPhiCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, muls2 + pvOffset * pvOffset); float midPointX = 0.5f * (x_InLo + x_OutLo); float midPointY = 0.5f * (y_InLo + y_OutLo); @@ -1549,7 +1548,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) > dPhiCut) return false; float alpha_InLo = __H2F(segmentsInGPU.dPhiChanges[innerSegmentIndex]); @@ -1640,7 +1639,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 = thetaMuls2 * 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..9bcf7d036f164 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,9 @@ namespace lst { float coshEta = dr3_InSeg / drt_InSeg; float dzErr = (zpitch_InLo + zpitch_OutLo) * (zpitch_InLo + zpitch_OutLo) * 2.f; - float sdlThetaMulsF2 = - (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 thetaMuls2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InLo) / 50.f) * (r3_InLo / rt_InLo); + float muls2 = thetaMuls2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + dzErr += muls2 * drt_OutLo_InLo * drt_OutLo_InLo / 3.f * coshEta * coshEta; dzErr = alpaka::math::sqrt(acc, dzErr); // Constructing upper and lower bound @@ -1418,12 +1417,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 pvOffset = 0.1f / rt_OutLo; + float dPhiCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, muls2 + pvOffset * pvOffset); 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) > dPhiCut) return false; float midPointX = 0.5f * (mdsInGPU.anchorX[firstMDIndex] + mdsInGPU.anchorX[thirdMDIndex]); @@ -1434,7 +1433,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) > dPhiCut) 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 +1548,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 = thetaMuls2 * 16.f / (min_ptBeta_maxPtBeta * min_ptBeta_maxPtBeta); const float alphaInAbsReg = alpaka::math::max( acc, @@ -1673,23 +1672,22 @@ 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 = - (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 thetaMuls2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InLo) / 50.f) * (rIn / rt_InLo); + const float muls2 = thetaMuls2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + drtErr += muls2 * 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 pvOffset = 0.1f / rt_OutLo; + float dPhiCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, muls2 + pvOffset * pvOffset); 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) > dPhiCut) return false; float midPointX = 0.5f * (mdsInGPU.anchorX[firstMDIndex] + mdsInGPU.anchorX[thirdMDIndex]); @@ -1699,7 +1697,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) > dPhiCut) return false; float sdIn_alpha = __H2F(segmentsInGPU.dPhiChanges[innerSegmentIndex]); @@ -1802,7 +1800,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 = thetaMuls2 * 16.f / (min_ptBeta_maxPtBeta * min_ptBeta_maxPtBeta); const float alphaInAbsReg = alpaka::math::max( acc, @@ -1914,14 +1912,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 thetaMuls2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rt_OutLo - rt_InLo) / 50.f); - float sdlMuls2 = sdlThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + float muls2 = thetaMuls2 * 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); + muls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta); float drtMean = drtSDIn * dzOutInAbs / alpaka::math::abs(acc, dzSDIn); float rtWindow = drtErr + rtGeom; @@ -1937,12 +1935,12 @@ namespace lst { return false; } - float sdlPVoff = 0.1f / rtOut; - float sdlCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, sdlMuls2 + sdlPVoff * sdlPVoff); + float pvOffset = 0.1f / rtOut; + float dPhiCut = alpha1GeV_OutLo + alpaka::math::sqrt(acc, muls2 + pvOffset * pvOffset); 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) > dPhiCut) return false; float midPointX = 0.5f * (mdsInGPU.anchorX[firstMDIndex] + mdsInGPU.anchorX[thirdMDIndex]); @@ -1953,7 +1951,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) > dPhiCut) return false; float sdIn_alpha = __H2F(segmentsInGPU.dPhiChanges[innerSegmentIndex]); @@ -2043,7 +2041,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 = thetaMuls2 * 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..9419363c1909c 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 dPhiCut_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)), + dPhiCut_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 thetaMuls2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rtOut - rtIn) / 50.f) * (r3In / rtIn); + float muls2 = thetaMuls2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + dzErr += muls2 * 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 thetaMuls2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2 * (rtOut - rtIn) / 50.f) * (rIn / rtIn); + const float muls2 = thetaMuls2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + drtErr += muls2 * 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 thetaMuls2 = (kMulsInGeV * kMulsInGeV) * (0.1f + 0.2f * (rtOut - rtIn) / 50.f); - float sdlMuls2 = sdlThetaMulsF2 * 9.f / (lst::ptCut * lst::ptCut) * 16.f; + float muls2 = thetaMuls2 * 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); + muls2 * multDzDr * multDzDr / 3.f * coshEta * coshEta); float drtMean = drtSDIn * dzOutInAbs / alpaka::math::abs(acc, dzSDIn); float rtWindow = drtErr + rtGeom; diff --git a/RecoTracker/LSTCore/standalone/.gitignore b/RecoTracker/LSTCore/standalone/.gitignore index aae6f2984e8cc..29e86cb6b932a 100644 --- a/RecoTracker/LSTCore/standalone/.gitignore +++ b/RecoTracker/LSTCore/standalone/.gitignore @@ -10,10 +10,10 @@ scripts/moduleconnection*.txt *.root .make.log* bin/doAnalysis -bin/sdl -bin/sdl_cuda -bin/sdl_cpu -bin/sdl_rocm +bin/lst +bin/lst_cuda +bin/lst_cpu +bin/lst_rocm code/rooutil/librooutil.so code/rooutil/rooutil.so .gitversion.txt diff --git a/RecoTracker/LSTCore/standalone/SDL/.gitignore b/RecoTracker/LSTCore/standalone/LST/.gitignore similarity index 100% rename from RecoTracker/LSTCore/standalone/SDL/.gitignore rename to RecoTracker/LSTCore/standalone/LST/.gitignore diff --git a/RecoTracker/LSTCore/standalone/SDL/Makefile b/RecoTracker/LSTCore/standalone/LST/Makefile similarity index 97% rename from RecoTracker/LSTCore/standalone/SDL/Makefile rename to RecoTracker/LSTCore/standalone/LST/Makefile index 4a90bd4c1301c..ba5e19e6a2779 100644 --- a/RecoTracker/LSTCore/standalone/SDL/Makefile +++ b/RecoTracker/LSTCore/standalone/LST/Makefile @@ -15,23 +15,23 @@ LSTOBJECTS_ROCM=$(patsubst ../../src/alpaka/%.dev.cc, %_rocm.o, $(LSTSOURCES)) # Default to CPU and CUDA backends ifeq ($(BACKEND),) - LIB_CPU=libsdl_cpu.so - LIB_CUDA=libsdl_cuda.so + LIB_CPU=liblst_cpu.so + LIB_CUDA=liblst_cuda.so endif ifneq ($(findstring cpu,$(BACKEND)),) - LIB_CPU=libsdl_cpu.so + LIB_CPU=liblst_cpu.so endif ifneq ($(findstring cuda,$(BACKEND)),) - LIB_CUDA=libsdl_cuda.so + LIB_CUDA=liblst_cuda.so endif ifneq ($(findstring rocm,$(BACKEND)),) - LIB_ROCM=libsdl_rocm.so + LIB_ROCM=liblst_rocm.so endif ifneq ($(findstring all,$(BACKEND)),) - LIB_CPU=libsdl_cpu.so - LIB_CUDA=libsdl_cuda.so - LIB_ROCM=libsdl_rocm.so + LIB_CPU=liblst_cpu.so + LIB_CUDA=liblst_cuda.so + LIB_ROCM=liblst_rocm.so endif LIBS=$(LIB_CPU) $(LIB_CUDA) $(LIB_ROCM) diff --git a/RecoTracker/LSTCore/standalone/Makefile b/RecoTracker/LSTCore/standalone/Makefile index bd33806a3c059..efcd2483c5eba 100644 --- a/RecoTracker/LSTCore/standalone/Makefile +++ b/RecoTracker/LSTCore/standalone/Makefile @@ -1,6 +1,6 @@ # Simple makefile -EXES := bin/sdl_cpu bin/sdl_cuda +EXES := bin/lst_cpu bin/lst_cuda SOURCES=$(wildcard code/core/*.cc) OBJECTS_CPU=$(SOURCES:.cc=_cpu.o) @@ -10,11 +10,11 @@ OBJECTS=$(OBJECTS_CPU) $(OBJECTS_CUDA) $(OBJECTS_ROCM) CXX = g++ CXXFLAGS = -g -O2 -Wall -fPIC -Wshadow -Woverloaded-virtual -Wno-unused-function -fno-var-tracking -std=c++17 -INCLUDEFLAGS= -ISDL -I$(shell pwd) -Icode -Icode/core -I${ALPAKA_ROOT}/include -I/${BOOST_ROOT}/include $(shell rooutil-config --include) -I$(shell root-config --incdir) -I${TRACKLOOPERDIR}/../../../ -I${CMSSW_BASE}/src -I../interface/ -I../interface/alpaka/ -I../src/ -I../src/alpaka/ +INCLUDEFLAGS= -ILST -I$(shell pwd) -Icode -Icode/core -I${ALPAKA_ROOT}/include -I/${BOOST_ROOT}/include $(shell rooutil-config --include) -I$(shell root-config --incdir) -I${TRACKLOOPERDIR}/../../../ -I${CMSSW_BASE}/src -I../interface/ -I../interface/alpaka/ -I../src/ -I../src/alpaka/ ifdef CMSSW_RELEASE_BASE INCLUDEFLAGS:= ${INCLUDEFLAGS} -I${CMSSW_RELEASE_BASE}/src endif -LDFLAGS = -g -O2 $(SDLLIB) -L${TRACKLOOPERDIR}/SDL $(shell rooutil-config --libs) $(shell root-config --libs) +LDFLAGS = -g -O2 $(LSTLIB) -L${TRACKLOOPERDIR}/LST $(shell rooutil-config --libs) $(shell root-config --libs) LDFLAGS_CUDA= -L${CUDA_HOME}/lib64 -lcudart LDFLAGS_ROCM= -L${ROCM_ROOT}/lib -lamdhip64 ALPAKAFLAGS = -DALPAKA_DEBUG=0 @@ -45,14 +45,14 @@ cutvalue_primitive: PRIMITIVEFLAG = ${PRIMITIVEFLAG_FLAGS} cutvalue_primitive: rooutil efficiency $(EXES) -bin/sdl_cpu: SDLLIB=-lsdl_cpu -bin/sdl_cpu: bin/sdl_cpu.o $(OBJECTS_CPU) +bin/lst_cpu: LSTLIB=-llst_cpu +bin/lst_cpu: bin/lst_cpu.o $(OBJECTS_CPU) $(CXX) $(LDFLAGS) $(EXTRAFLAGS) $(INCLUDEFLAGS) $(ALPAKAFLAGS) $^ $(ROOTLIBS) $(PTCUTFLAG) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(DOQUINTUPLET) $(ALPAKA_CPU) -o $@ -bin/sdl_cuda: SDLLIB=-lsdl_cuda -bin/sdl_cuda: bin/sdl_cuda.o $(OBJECTS_CUDA) +bin/lst_cuda: LSTLIB=-llst_cuda +bin/lst_cuda: bin/lst_cuda.o $(OBJECTS_CUDA) $(CXX) $(LDFLAGS) $(EXTRAFLAGS) $(INCLUDEFLAGS) $(ALPAKAFLAGS) $^ $(ROOTLIBS) $(PTCUTFLAG) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(DOQUINTUPLET) $(ALPAKA_CUDA) $(LDFLAGS_CUDA) -o $@ -bin/sdl_rocm: SDLLIB=-lsdl_rocm -bin/sdl_rocm: bin/sdl_rocm.o $(OBJECTS_ROCM) +bin/lst_rocm: LSTLIB=-llst_rocm +bin/lst_rocm: bin/lst_rocm.o $(OBJECTS_ROCM) $(CXX) $(LDFLAGS) $(EXTRAFLAGS) $(INCLUDEFLAGS) $(ALPAKAFLAGS) $^ $(ROOTLIBS) $(PTCUTFLAG) $(CUTVALUEFLAG) $(PRIMITIVEFLAG) $(DOQUINTUPLET) $(ALPAKA_ROCM) $(LDFLAGS_ROCM) -o $@ %_cpu.o: %.cc rooutil @@ -69,10 +69,10 @@ efficiency: rooutil $(MAKE) -C efficiency/ clean: - rm -f $(OBJECTS) bin/*.o $(EXES) bin/sdl + rm -f $(OBJECTS) bin/*.o $(EXES) bin/lst rm -f code/rooutil/*.so code/rooutil/*.o - rm -f bin/sdl.o - rm -f SDL/*.o + rm -f bin/lst.o + rm -f LST/*.o cd efficiency/ && make clean .PHONY: rooutil efficiency diff --git a/RecoTracker/LSTCore/standalone/bin/sdl.cc b/RecoTracker/LSTCore/standalone/bin/lst.cc similarity index 99% rename from RecoTracker/LSTCore/standalone/bin/sdl.cc rename to RecoTracker/LSTCore/standalone/bin/lst.cc index 3795cdc15bc4f..e67fe5b62d269 100644 --- a/RecoTracker/LSTCore/standalone/bin/sdl.cc +++ b/RecoTracker/LSTCore/standalone/bin/lst.cc @@ -1,4 +1,4 @@ -#include "sdl.h" +#include "lst.h" #include @@ -37,7 +37,7 @@ int main(int argc, char **argv) { // cxxopts is just a tool to parse argc, and argv easily // Grand option setting - cxxopts::Options options("\n $ sdl", + cxxopts::Options options("\n $ lst", "\n **********************\n * *\n * " "Looper *\n * *\n **********************\n"); @@ -291,13 +291,13 @@ int main(int argc, char **argv) { writeMetaData(); // Run the code - run_sdl(); + run_lst(); return 0; } //___________________________________________________________________________________________________________________________________________________________________________________________ -void run_sdl() { +void run_lst() { Device devAcc = alpaka::getDevByIdx(ALPAKA_ACCELERATOR_NAMESPACE::Platform{}, 0u); std::vector queues; for (int s = 0; s < ana.streams; s++) { diff --git a/RecoTracker/LSTCore/standalone/bin/sdl.h b/RecoTracker/LSTCore/standalone/bin/lst.h similarity index 83% rename from RecoTracker/LSTCore/standalone/bin/sdl.h rename to RecoTracker/LSTCore/standalone/bin/lst.h index d4e1ff658945b..4a5699a1dd59f 100644 --- a/RecoTracker/LSTCore/standalone/bin/sdl.h +++ b/RecoTracker/LSTCore/standalone/bin/lst.h @@ -1,5 +1,5 @@ -#ifndef sdl_h -#define sdl_h +#ifndef lst_h +#define lst_h #include #include @@ -20,11 +20,11 @@ // Efficiency study modules #include "AnalysisConfig.h" #include "trkCore.h" -#include "write_sdl_ntuple.h" +#include "write_lst_ntuple.h" #include "TSystem.h" // Main code -void run_sdl(); +void run_lst(); #endif diff --git a/RecoTracker/LSTCore/standalone/bin/sdl_make_tracklooper b/RecoTracker/LSTCore/standalone/bin/lst_make_tracklooper similarity index 88% rename from RecoTracker/LSTCore/standalone/bin/sdl_make_tracklooper rename to RecoTracker/LSTCore/standalone/bin/lst_make_tracklooper index 2cadee47be49c..bb77aa67cdf7f 100755 --- a/RecoTracker/LSTCore/standalone/bin/sdl_make_tracklooper +++ b/RecoTracker/LSTCore/standalone/bin/lst_make_tracklooper @@ -21,7 +21,7 @@ usage() echo " -h Help (Display this message)" echo " -c cache (Make library with cache enabled)" echo " -s show log (Full compilation script to stdout)" - echo " -m make clean binaries (Make clean binaries before remake. e.g. when header files changed in SDL/*.h)" + echo " -m make clean binaries (Make clean binaries before remake. e.g. when header files changed in LST/*.h)" echo " -d cut value ntuple (With extra variables in a debug ntuple file)" echo " -p primitive object ntuple (With extra variables related to primitive objects)" echo " -N neural networks (Toggle LST neural networks)" @@ -123,8 +123,8 @@ if $MAKECACHE; then MAKETARGET=${MAKETARGET}_cache; fi # If make clean binaries are called then first make clean before making if $MAKECLEANBINARIES; then - echo "First make cleaning all of TrackLooper objects and libsdl*.so" | tee -a ${LOG} - cd SDL;make clean >>${LOG} 2>&1;cd -; + echo "First make cleaning all of TrackLooper objects and liblst*.so" | tee -a ${LOG} + cd LST;make clean >>${LOG} 2>&1;cd -; make clean >> ${LOG} 2>&1 fi #if make cut value is called then cut value ntuple making is done @@ -152,19 +152,19 @@ BACKENDOPT="BACKEND=" EXES= if [ "${ALLBACKENDS}" == true ]; then BACKENDOPT="BACKEND=all" - EXES="bin/sdl_cpu bin/sdl_cuda bin/sdl_rocm" + EXES="bin/lst_cpu bin/lst_cuda bin/lst_rocm" else if [ "${CPUBACKEND}" == true ]; then BACKENDOPT=$BACKENDOPT"cpu," - EXES="$EXES bin/sdl_cpu" + EXES="$EXES bin/lst_cpu" fi if [ "${CUDABACKEND}" == true ]; then BACKENDOPT=$BACKENDOPT"cuda," - EXES="$EXES bin/sdl_cuda" + EXES="$EXES bin/lst_cuda" fi if [ "${ROCMBACKEND}" == true ]; then BACKENDOPT=$BACKENDOPT"rocm," - EXES="$EXES bin/sdl_rocm" + EXES="$EXES bin/lst_rocm" fi fi @@ -187,21 +187,21 @@ echo "-------------------------------------------------------------------------- echo "---------------------------------------------------------------------------------------------" >> ${LOG} 2>&1 echo "---------------------------------------------------------------------------------------------" >> ${LOG} 2>&1 if $SHOWLOG; then - (cd SDL && make clean && make ${T5CUTOPT} ${BACKENDOPT} ${PRINTWARNINGSOPT} ${PTCUTOPT} -j 32 ${MAKETARGET} && cd -) 2>&1 | tee -a ${LOG} + (cd LST && make clean && make ${T5CUTOPT} ${BACKENDOPT} ${PRINTWARNINGSOPT} ${PTCUTOPT} -j 32 ${MAKETARGET} && cd -) 2>&1 | tee -a ${LOG} else - (cd SDL && make clean && make ${T5CUTOPT} ${BACKENDOPT} ${PRINTWARNINGSOPT} ${PTCUTOPT} -j 32 ${MAKETARGET} && cd -) >> ${LOG} 2>&1 + (cd LST && make clean && make ${T5CUTOPT} ${BACKENDOPT} ${PRINTWARNINGSOPT} ${PTCUTOPT} -j 32 ${MAKETARGET} && cd -) >> ${LOG} 2>&1 fi -if ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cpu"* ]]) && [ ! -f SDL/libsdl_cpu.so ]; then - echo "ERROR: libsdl_cpu.so failed to compile!" | tee -a ${LOG} +if ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cpu"* ]]) && [ ! -f LST/liblst_cpu.so ]; then + echo "ERROR: liblst_cpu.so failed to compile!" | tee -a ${LOG} echo "See ${LOG} file for more detail..." | tee -a ${LOG} exit 1 -elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cuda"* ]]) && [ ! -f SDL/libsdl_cuda.so ]; then - echo "ERROR: libsdl_cuda.so failed to compile!" | tee -a ${LOG} +elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cuda"* ]]) && [ ! -f LST/liblst_cuda.so ]; then + echo "ERROR: liblst_cuda.so failed to compile!" | tee -a ${LOG} echo "See ${LOG} file for more detail..." | tee -a ${LOG} exit 1 -elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"rocm"* ]]) && [ ! -f SDL/libsdl_rocm.so ]; then - echo "ERROR: libsdl_rocm.so failed to compile!" | tee -a ${LOG} +elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"rocm"* ]]) && [ ! -f LST/liblst_rocm.so ]; then + echo "ERROR: liblst_rocm.so failed to compile!" | tee -a ${LOG} echo "See ${LOG} file for more detail..." | tee -a ${LOG} exit 1 fi @@ -229,27 +229,27 @@ else make EXES="${EXES}" ${TRACKLOOPERTARGET} ${PTCUTOPT} -j >> ${LOG} 2>&1 fi -if ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cpu"* ]]) && [ ! -f bin/sdl_cpu ]; then - echo "ERROR: bin/sdl_cpu failed to compile!" | tee -a ${LOG} +if ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cpu"* ]]) && [ ! -f bin/lst_cpu ]; then + echo "ERROR: bin/lst_cpu failed to compile!" | tee -a ${LOG} echo "See ${LOG} file for more detail..." | tee -a ${LOG} exit 1 -elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cuda"* ]]) && [ ! -f bin/sdl_cuda ]; then - echo "ERROR: bin/sdl_cuda failed to compile!" | tee -a ${LOG} +elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"cuda"* ]]) && [ ! -f bin/lst_cuda ]; then + echo "ERROR: bin/lst_cuda failed to compile!" | tee -a ${LOG} echo "See ${LOG} file for more detail..." | tee -a ${LOG} exit 1 -elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"rocm"* ]]) && [ ! -f bin/sdl_rocm ]; then - echo "ERROR: bin/sdl_rocm failed to compile!" | tee -a ${LOG} +elif ([[ "$BACKENDOPT" == *"all"* ]] || [[ "$BACKENDOPT" == *"rocm"* ]]) && [ ! -f bin/lst_rocm ]; then + echo "ERROR: bin/lst_rocm failed to compile!" | tee -a ${LOG} echo "See ${LOG} file for more detail..." | tee -a ${LOG} exit 1 fi # Make a symlink with priority CUDA > CPU > ROCM if [ "${CUDABACKEND}" == true ]; then - ln -sfr bin/sdl_cuda bin/sdl + ln -sfr bin/lst_cuda bin/lst elif [ "${CPUBACKEND}" == true ]; then - ln -sfr bin/sdl_cpu bin/sdl + ln -sfr bin/lst_cpu bin/lst elif [ "${ROCMBACKEND}" == true ]; then - ln -sfr bin/sdl_rocm bin/sdl + ln -sfr bin/lst_rocm bin/lst fi echo "" >> ${LOG} diff --git a/RecoTracker/LSTCore/standalone/bin/sdl_run b/RecoTracker/LSTCore/standalone/bin/lst_run similarity index 87% rename from RecoTracker/LSTCore/standalone/bin/sdl_run rename to RecoTracker/LSTCore/standalone/bin/lst_run index 2ed9c20fb7949..6240b0b79a402 100755 --- a/RecoTracker/LSTCore/standalone/bin/sdl_run +++ b/RecoTracker/LSTCore/standalone/bin/lst_run @@ -25,7 +25,7 @@ usage() echo " -t tag for this run (Tag for this run)" echo " -d delete previous output (Delete the previous outputs and re-run)" echo " -b backend (Select a backend: cuda or cpu; default cuda)" - echo " -a arguments (Add command line arguments to the sdl command)" + echo " -a arguments (Add command line arguments to the lst command)" echo exit } @@ -102,7 +102,7 @@ file_already_exists() { echo "ERROR - Output already exists!" echo "" - echo " Out of caution, the sdl_run fails to run if the following .root output files already exists:" + echo " Out of caution, the lst_run fails to run if the following .root output files already exists:" echo "" if [ -f "$LSTNTUPLEOUTPUT" ]; then echo " $LSTNTUPLEOUTPUT already exists." @@ -132,31 +132,31 @@ mkdir -p ${LSTOUTPUTDIR} rm -f ${LSTOUTPUTDIR}/${JOBTAG}__LSTRun.log if [[ ${PRECOMPILED} != true ]]; then echo "Compiling code..." - sdl_make_tracklooper ${FLAGS} >> ${LSTOUTPUTDIR}/${JOBTAG}__LSTRun.log + lst_make_tracklooper ${FLAGS} >> ${LSTOUTPUTDIR}/${JOBTAG}__LSTRun.log fi # If a backend is specified then make sure that corresponding library exists # and make a symbolic link to the correct binary if [ "${BACKEND}" == "cuda" ]; then - if [ ! -f ${TRACKLOOPERDIR}/SDL/libsdl_cuda.so ]; then + if [ ! -f ${TRACKLOOPERDIR}/LST/liblst_cuda.so ]; then echo "Error: CUDA backend was not compiled." exit 1 fi - ln -s -f ${TRACKLOOPERDIR}/bin/sdl_cuda ${TRACKLOOPERDIR}/bin/sdl + ln -s -f ${TRACKLOOPERDIR}/bin/lst_cuda ${TRACKLOOPERDIR}/bin/lst elif [ "${BACKEND}" == "cpu" ]; then - if [ ! -f ${TRACKLOOPERDIR}/SDL/libsdl_cpu.so ]; then + if [ ! -f ${TRACKLOOPERDIR}/LST/liblst_cpu.so ]; then echo "Error: CPU backend was not compiled." exit 1 fi - ln -s -f ${TRACKLOOPERDIR}/bin/sdl_cpu ${TRACKLOOPERDIR}/bin/sdl + ln -s -f ${TRACKLOOPERDIR}/bin/lst_cpu ${TRACKLOOPERDIR}/bin/lst elif [ "${BACKEND}" == "rocm" ]; then - if [ ! -f ${TRACKLOOPERDIR}/SDL/libsdl_rocm.so ]; then + if [ ! -f ${TRACKLOOPERDIR}/LST/liblst_rocm.so ]; then echo "Error: ROCM backend was not compiled." exit 1 fi - ln -s -f ${TRACKLOOPERDIR}/bin/sdl_rocm ${TRACKLOOPERDIR}/bin/sdl + ln -s -f ${TRACKLOOPERDIR}/bin/lst_rocm ${TRACKLOOPERDIR}/bin/lst elif [ "${BACKEND}" == "default" ]; then - if [[ ! -e ${TRACKLOOPERDIR}/bin/sdl ]]; then + if [[ ! -e ${TRACKLOOPERDIR}/bin/lst ]]; then echo "Error: default backend was not found. Please recompile." exit 1 fi @@ -166,7 +166,7 @@ else fi echo "Running LST code..." -sdl -i ${SAMPLE} -o ${LSTOUTPUTDIR}/${JOBTAG}__LSTNtuple.root -n ${NEVENTS} ${ARGUMENTS} >> ${LSTOUTPUTDIR}/${JOBTAG}__LSTRun.log 2>&1 || { echo 'ERROR: sdl command failed!' ; exit 1; } +lst -i ${SAMPLE} -o ${LSTOUTPUTDIR}/${JOBTAG}__LSTNtuple.root -n ${NEVENTS} ${ARGUMENTS} >> ${LSTOUTPUTDIR}/${JOBTAG}__LSTRun.log 2>&1 || { echo 'ERROR: lst command failed!' ; exit 1; } echo "Creating performance histograms..." createPerfNumDenHists -i ${LSTOUTPUTDIR}/${JOBTAG}__LSTNtuple.root -o ${LSTOUTPUTDIR}/${JOBTAG}__LSTNumDen.root >> ${LSTOUTPUTDIR}/${JOBTAG}__LSTRun.log 2>&1 || { echo 'ERROR: createPerfNumDenHists command failed!' ; exit 1; } echo "Creating plots..." diff --git a/RecoTracker/LSTCore/standalone/code/core/AnalysisConfig.h b/RecoTracker/LSTCore/standalone/code/core/AnalysisConfig.h index e06e5e7af26f4..8608bc95ed2fa 100644 --- a/RecoTracker/LSTCore/standalone/code/core/AnalysisConfig.h +++ b/RecoTracker/LSTCore/standalone/code/core/AnalysisConfig.h @@ -93,7 +93,7 @@ class AnalysisConfig { RooUtil::TTreeX* tx; // Boolean to control whether to write ntuple or not - bool write_sdl_ntuple; + bool write_lst_ntuple; // Module boundaries related info std::map> moduleBoundaries; diff --git a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc b/RecoTracker/LSTCore/standalone/code/core/write_lst_ntuple.cc similarity index 99% rename from RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc rename to RecoTracker/LSTCore/standalone/code/core/write_lst_ntuple.cc index 03ea4515142ad..33eaeefc2d796 100644 --- a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc +++ b/RecoTracker/LSTCore/standalone/code/core/write_lst_ntuple.cc @@ -1,4 +1,4 @@ -#include "write_sdl_ntuple.h" +#include "write_lst_ntuple.h" using namespace ALPAKA_ACCELERATOR_NAMESPACE; diff --git a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h b/RecoTracker/LSTCore/standalone/code/core/write_lst_ntuple.h similarity index 97% rename from RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h rename to RecoTracker/LSTCore/standalone/code/core/write_lst_ntuple.h index 4e3db30caf1fc..cd20553772b9a 100644 --- a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h +++ b/RecoTracker/LSTCore/standalone/code/core/write_lst_ntuple.h @@ -1,5 +1,5 @@ -#ifndef write_sdl_ntuple_h -#define write_sdl_ntuple_h +#ifndef write_lst_ntuple_h +#define write_lst_ntuple_h #include #include diff --git a/RecoTracker/LSTCore/standalone/efficiency/Makefile b/RecoTracker/LSTCore/standalone/efficiency/Makefile index 53d375bdf4063..ad4bd538ff7a8 100644 --- a/RecoTracker/LSTCore/standalone/efficiency/Makefile +++ b/RecoTracker/LSTCore/standalone/efficiency/Makefile @@ -23,10 +23,10 @@ EXTRAFLAGS = -fPIC -ITMultiDrawTreePlayer -Wunused-variable -lTMVA -lEG -lGenVe all: rooutil $(EXE) -$(EXE): src/performance.o src/helper.o src/SDL.o - $(LD) $(CXXFLAGS) $(LDFLAGS) src/performance.o src/helper.o src/SDL.o $(ROOTLIBS) $(EXTRAFLAGS) -o $@ +$(EXE): src/performance.o src/helper.o src/LSTEff.o + $(LD) $(CXXFLAGS) $(LDFLAGS) src/performance.o src/helper.o src/LSTEff.o $(ROOTLIBS) $(EXTRAFLAGS) -o $@ -src/SDL.o: src/SDL.cc src/SDL.h +src/LSTEff.o: src/LSTEff.cc src/LSTEff.h $(CC) $(CFLAGS) $(EXTRACFLAGS) $< -c -o $@ src/performance.o: src/performance.cc src/performance.h @@ -39,6 +39,6 @@ rooutil: $(MAKE) -C ../code/rooutil clean: - rm -r src/performance.o src/helper.o src/SDL.o $(EXE) + rm -r src/performance.o src/helper.o src/LSTEff.o $(EXE) .PHONY: all clean rooutil diff --git a/RecoTracker/LSTCore/standalone/efficiency/bin/sdl_timing b/RecoTracker/LSTCore/standalone/efficiency/bin/lst_timing similarity index 93% rename from RecoTracker/LSTCore/standalone/efficiency/bin/sdl_timing rename to RecoTracker/LSTCore/standalone/efficiency/bin/lst_timing index 15c238217633b..0a359d1fe0fe6 100755 --- a/RecoTracker/LSTCore/standalone/efficiency/bin/sdl_timing +++ b/RecoTracker/LSTCore/standalone/efficiency/bin/lst_timing @@ -7,9 +7,9 @@ run_rocm() nevents=$3 shift 3 # ROCm backend - sdl_make_tracklooper -mR $* + lst_make_tracklooper -mR $* for s_value in 1 2 4 6 8; do - sdl -n ${NEVENTS} -o ${OUTDIR}/rocm_${version}_s${s_value}.root -v 1 -w 0 -s ${s_value} -i ${sample} | tee -a timing_temp.txt + lst -n ${NEVENTS} -o ${OUTDIR}/rocm_${version}_s${s_value}.root -v 1 -w 0 -s ${s_value} -i ${sample} | tee -a timing_temp.txt done } @@ -20,9 +20,9 @@ run_cuda() nevents=$3 shift 3 # CUDA backend - sdl_make_tracklooper -mG $* + lst_make_tracklooper -mG $* for s_value in 1 2 4 6 8; do - sdl -n ${NEVENTS} -o ${OUTDIR}/cuda_${version}_s${s_value}.root -v 1 -w 0 -s ${s_value} -i ${sample} | tee -a timing_temp.txt + lst -n ${NEVENTS} -o ${OUTDIR}/cuda_${version}_s${s_value}.root -v 1 -w 0 -s ${s_value} -i ${sample} | tee -a timing_temp.txt done } @@ -33,9 +33,9 @@ run_cpu() nevents=$3 shift 3 # CPU backend - sdl_make_tracklooper -mC $* + lst_make_tracklooper -mC $* for s_value in 1 4 16 32 64; do - sdl -n ${NEVENTS} -o ${OUTDIR}/cpu_${version}_s${s_value}.root -v 1 -w 0 -s ${s_value} -i ${sample} | tee -a timing_temp.txt + lst -n ${NEVENTS} -o ${OUTDIR}/cpu_${version}_s${s_value}.root -v 1 -w 0 -s ${s_value} -i ${sample} | tee -a timing_temp.txt done } diff --git a/RecoTracker/LSTCore/standalone/efficiency/src/SDL.cc b/RecoTracker/LSTCore/standalone/efficiency/src/LSTEff.cc similarity index 83% rename from RecoTracker/LSTCore/standalone/efficiency/src/SDL.cc rename to RecoTracker/LSTCore/standalone/efficiency/src/LSTEff.cc index 2f6d55d8d3415..6474f9a17ae04 100644 --- a/RecoTracker/LSTCore/standalone/efficiency/src/SDL.cc +++ b/RecoTracker/LSTCore/standalone/efficiency/src/LSTEff.cc @@ -1,7 +1,7 @@ -#include "SDL.h" -SDL sdl; +#include "LSTEff.h" +LSTEff lstEff; -void SDL::Init(TTree *tree) { +void LSTEff::Init(TTree *tree) { tree->SetMakeClass(1); pT5_occupancies_branch = 0; if (tree->GetBranch("pT5_occupancies") != 0) { @@ -1027,7 +1027,7 @@ void SDL::Init(TTree *tree) { } tree->SetMakeClass(0); } -void SDL::GetEntry(unsigned int idx) { +void LSTEff::GetEntry(unsigned int idx) { index = idx; pT5_occupancies_isLoaded = false; t3_phi_isLoaded = false; @@ -1176,7 +1176,7 @@ void SDL::GetEntry(unsigned int idx) { tce_rzChiSquared_isLoaded = false; pT3_matched_simIdx_isLoaded = false; } -void SDL::LoadAllBranches() { +void LSTEff::LoadAllBranches() { if (pT5_occupancies_branch != 0) pT5_occupancies(); if (t3_phi_branch != 0) @@ -1470,7 +1470,7 @@ void SDL::LoadAllBranches() { if (pT3_matched_simIdx_branch != 0) pT3_matched_simIdx(); } -const int &SDL::pT5_occupancies() { +const int &LSTEff::pT5_occupancies() { if (not pT5_occupancies_isLoaded) { if (pT5_occupancies_branch != 0) { pT5_occupancies_branch->GetEntry(index); @@ -1482,7 +1482,7 @@ const int &SDL::pT5_occupancies() { } return pT5_occupancies_; } -const std::vector &SDL::t3_phi() { +const std::vector &LSTEff::t3_phi() { if (not t3_phi_isLoaded) { if (t3_phi_branch != 0) { t3_phi_branch->GetEntry(index); @@ -1494,7 +1494,7 @@ const std::vector &SDL::t3_phi() { } return *t3_phi_; } -const std::vector &SDL::t5_score_rphisum() { +const std::vector &LSTEff::t5_score_rphisum() { if (not t5_score_rphisum_isLoaded) { if (t5_score_rphisum_branch != 0) { t5_score_rphisum_branch->GetEntry(index); @@ -1506,7 +1506,7 @@ const std::vector &SDL::t5_score_rphisum() { } return *t5_score_rphisum_; } -const std::vector &SDL::pT4_isFake() { +const std::vector &LSTEff::pT4_isFake() { if (not pT4_isFake_isLoaded) { if (pT4_isFake_branch != 0) { pT4_isFake_branch->GetEntry(index); @@ -1518,7 +1518,7 @@ const std::vector &SDL::pT4_isFake() { } return *pT4_isFake_; } -const std::vector &SDL::t3_isDuplicate() { +const std::vector &LSTEff::t3_isDuplicate() { if (not t3_isDuplicate_isLoaded) { if (t3_isDuplicate_branch != 0) { t3_isDuplicate_branch->GetEntry(index); @@ -1530,7 +1530,7 @@ const std::vector &SDL::t3_isDuplicate() { } return *t3_isDuplicate_; } -const std::vector &SDL::sim_event() { +const std::vector &LSTEff::sim_event() { if (not sim_event_isLoaded) { if (sim_event_branch != 0) { sim_event_branch->GetEntry(index); @@ -1542,7 +1542,7 @@ const std::vector &SDL::sim_event() { } return *sim_event_; } -const std::vector &SDL::sim_q() { +const std::vector &LSTEff::sim_q() { if (not sim_q_isLoaded) { if (sim_q_branch != 0) { sim_q_branch->GetEntry(index); @@ -1554,7 +1554,7 @@ const std::vector &SDL::sim_q() { } return *sim_q_; } -const std::vector &SDL::sim_eta() { +const std::vector &LSTEff::sim_eta() { if (not sim_eta_isLoaded) { if (sim_eta_branch != 0) { sim_eta_branch->GetEntry(index); @@ -1566,7 +1566,7 @@ const std::vector &SDL::sim_eta() { } return *sim_eta_; } -const std::vector &SDL::pT3_foundDuplicate() { +const std::vector &LSTEff::pT3_foundDuplicate() { if (not pT3_foundDuplicate_isLoaded) { if (pT3_foundDuplicate_branch != 0) { pT3_foundDuplicate_branch->GetEntry(index); @@ -1578,7 +1578,7 @@ const std::vector &SDL::pT3_foundDuplicate() { } return *pT3_foundDuplicate_; } -const std::vector &SDL::sim_len() { +const std::vector &LSTEff::sim_len() { if (not sim_len_isLoaded) { if (sim_len_branch != 0) { sim_len_branch->GetEntry(index); @@ -1590,7 +1590,7 @@ const std::vector &SDL::sim_len() { } return *sim_len_; } -const std::vector &SDL::pureTCE_isDuplicate() { +const std::vector &LSTEff::pureTCE_isDuplicate() { if (not pureTCE_isDuplicate_isLoaded) { if (pureTCE_isDuplicate_branch != 0) { pureTCE_isDuplicate_branch->GetEntry(index); @@ -1602,7 +1602,7 @@ const std::vector &SDL::pureTCE_isDuplicate() { } return *pureTCE_isDuplicate_; } -const std::vector &SDL::pT3_score() { +const std::vector &LSTEff::pT3_score() { if (not pT3_score_isLoaded) { if (pT3_score_branch != 0) { pT3_score_branch->GetEntry(index); @@ -1614,7 +1614,7 @@ const std::vector &SDL::pT3_score() { } return *pT3_score_; } -const std::vector &SDL::t5_eta() { +const std::vector &LSTEff::t5_eta() { if (not t5_eta_isLoaded) { if (t5_eta_branch != 0) { t5_eta_branch->GetEntry(index); @@ -1626,7 +1626,7 @@ const std::vector &SDL::t5_eta() { } return *t5_eta_; } -const std::vector &SDL::sim_denom() { +const std::vector &LSTEff::sim_denom() { if (not sim_denom_isLoaded) { if (sim_denom_branch != 0) { sim_denom_branch->GetEntry(index); @@ -1638,7 +1638,7 @@ const std::vector &SDL::sim_denom() { } return *sim_denom_; } -const std::vector &SDL::pT5_isDuplicate() { +const std::vector &LSTEff::pT5_isDuplicate() { if (not pT5_isDuplicate_isLoaded) { if (pT5_isDuplicate_branch != 0) { pT5_isDuplicate_branch->GetEntry(index); @@ -1650,7 +1650,7 @@ const std::vector &SDL::pT5_isDuplicate() { } return *pT5_isDuplicate_; } -const std::vector &SDL::sim_tce_matched() { +const std::vector &LSTEff::sim_tce_matched() { if (not sim_tce_matched_isLoaded) { if (sim_tce_matched_branch != 0) { sim_tce_matched_branch->GetEntry(index); @@ -1662,7 +1662,7 @@ const std::vector &SDL::sim_tce_matched() { } return *sim_tce_matched_; } -const std::vector &SDL::pT3_isDuplicate() { +const std::vector &LSTEff::pT3_isDuplicate() { if (not pT3_isDuplicate_isLoaded) { if (pT3_isDuplicate_branch != 0) { pT3_isDuplicate_branch->GetEntry(index); @@ -1674,7 +1674,7 @@ const std::vector &SDL::pT3_isDuplicate() { } return *pT3_isDuplicate_; } -const std::vector &SDL::tc_isDuplicate() { +const std::vector &LSTEff::tc_isDuplicate() { if (not tc_isDuplicate_isLoaded) { if (tc_isDuplicate_branch != 0) { tc_isDuplicate_branch->GetEntry(index); @@ -1686,7 +1686,7 @@ const std::vector &SDL::tc_isDuplicate() { } return *tc_isDuplicate_; } -const std::vector &SDL::pT3_eta_2() { +const std::vector &LSTEff::pT3_eta_2() { if (not pT3_eta_2_isLoaded) { if (pT3_eta_2_branch != 0) { pT3_eta_2_branch->GetEntry(index); @@ -1698,7 +1698,7 @@ const std::vector &SDL::pT3_eta_2() { } return *pT3_eta_2_; } -const std::vector &SDL::sim_pT3_matched() { +const std::vector &LSTEff::sim_pT3_matched() { if (not sim_pT3_matched_isLoaded) { if (sim_pT3_matched_branch != 0) { sim_pT3_matched_branch->GetEntry(index); @@ -1710,7 +1710,7 @@ const std::vector &SDL::sim_pT3_matched() { } return *sim_pT3_matched_; } -const std::vector &SDL::pureTCE_rzChiSquared() { +const std::vector &LSTEff::pureTCE_rzChiSquared() { if (not pureTCE_rzChiSquared_isLoaded) { if (pureTCE_rzChiSquared_branch != 0) { pureTCE_rzChiSquared_branch->GetEntry(index); @@ -1722,7 +1722,7 @@ const std::vector &SDL::pureTCE_rzChiSquared() { } return *pureTCE_rzChiSquared_; } -const std::vector &SDL::t4_isDuplicate() { +const std::vector &LSTEff::t4_isDuplicate() { if (not t4_isDuplicate_isLoaded) { if (t4_isDuplicate_branch != 0) { t4_isDuplicate_branch->GetEntry(index); @@ -1734,7 +1734,7 @@ const std::vector &SDL::t4_isDuplicate() { } return *t4_isDuplicate_; } -const std::vector &SDL::pureTCE_eta() { +const std::vector &LSTEff::pureTCE_eta() { if (not pureTCE_eta_isLoaded) { if (pureTCE_eta_branch != 0) { pureTCE_eta_branch->GetEntry(index); @@ -1746,7 +1746,7 @@ const std::vector &SDL::pureTCE_eta() { } return *pureTCE_eta_; } -const std::vector &SDL::tce_rPhiChiSquared() { +const std::vector &LSTEff::tce_rPhiChiSquared() { if (not tce_rPhiChiSquared_isLoaded) { if (tce_rPhiChiSquared_branch != 0) { tce_rPhiChiSquared_branch->GetEntry(index); @@ -1758,7 +1758,7 @@ const std::vector &SDL::tce_rPhiChiSquared() { } return *tce_rPhiChiSquared_; } -const std::vector &SDL::pureTCE_anchorType() { +const std::vector &LSTEff::pureTCE_anchorType() { if (not pureTCE_anchorType_isLoaded) { if (pureTCE_anchorType_branch != 0) { pureTCE_anchorType_branch->GetEntry(index); @@ -1770,7 +1770,7 @@ const std::vector &SDL::pureTCE_anchorType() { } return *pureTCE_anchorType_; } -const std::vector &SDL::pureTCE_pt() { +const std::vector &LSTEff::pureTCE_pt() { if (not pureTCE_pt_isLoaded) { if (pureTCE_pt_branch != 0) { pureTCE_pt_branch->GetEntry(index); @@ -1782,7 +1782,7 @@ const std::vector &SDL::pureTCE_pt() { } return *pureTCE_pt_; } -const std::vector &SDL::sim_pt() { +const std::vector &LSTEff::sim_pt() { if (not sim_pt_isLoaded) { if (sim_pt_branch != 0) { sim_pt_branch->GetEntry(index); @@ -1794,7 +1794,7 @@ const std::vector &SDL::sim_pt() { } return *sim_pt_; } -const std::vector &SDL::t5_eta_2() { +const std::vector &LSTEff::t5_eta_2() { if (not t5_eta_2_isLoaded) { if (t5_eta_2_branch != 0) { t5_eta_2_branch->GetEntry(index); @@ -1806,7 +1806,7 @@ const std::vector &SDL::t5_eta_2() { } return *t5_eta_2_; } -const std::vector &SDL::pLS_eta() { +const std::vector &LSTEff::pLS_eta() { if (not pLS_eta_isLoaded) { if (pLS_eta_branch != 0) { pLS_eta_branch->GetEntry(index); @@ -1818,7 +1818,7 @@ const std::vector &SDL::pLS_eta() { } return *pLS_eta_; } -const std::vector &SDL::sim_pdgId() { +const std::vector &LSTEff::sim_pdgId() { if (not sim_pdgId_isLoaded) { if (sim_pdgId_branch != 0) { sim_pdgId_branch->GetEntry(index); @@ -1830,7 +1830,7 @@ const std::vector &SDL::sim_pdgId() { } return *sim_pdgId_; } -const std::vector &SDL::t3_eta() { +const std::vector &LSTEff::t3_eta() { if (not t3_eta_isLoaded) { if (t3_eta_branch != 0) { t3_eta_branch->GetEntry(index); @@ -1842,7 +1842,7 @@ const std::vector &SDL::t3_eta() { } return *t3_eta_; } -const std::vector &SDL::tce_layer_binary() { +const std::vector &LSTEff::tce_layer_binary() { if (not tce_layer_binary_isLoaded) { if (tce_layer_binary_branch != 0) { tce_layer_binary_branch->GetEntry(index); @@ -1854,7 +1854,7 @@ const std::vector &SDL::tce_layer_binary() { } return *tce_layer_binary_; } -const std::vector &SDL::sim_TC_matched_nonextended() { +const std::vector &LSTEff::sim_TC_matched_nonextended() { if (not sim_TC_matched_nonextended_isLoaded) { if (sim_TC_matched_nonextended_branch != 0) { sim_TC_matched_nonextended_branch->GetEntry(index); @@ -1866,7 +1866,7 @@ const std::vector &SDL::sim_TC_matched_nonextended() { } return *sim_TC_matched_nonextended_; } -const std::vector &SDL::t4_occupancies() { +const std::vector &LSTEff::t4_occupancies() { if (not t4_occupancies_isLoaded) { if (t4_occupancies_branch != 0) { t4_occupancies_branch->GetEntry(index); @@ -1878,7 +1878,7 @@ const std::vector &SDL::t4_occupancies() { } return *t4_occupancies_; } -const std::vector &SDL::tce_eta() { +const std::vector &LSTEff::tce_eta() { if (not tce_eta_isLoaded) { if (tce_eta_branch != 0) { tce_eta_branch->GetEntry(index); @@ -1890,7 +1890,7 @@ const std::vector &SDL::tce_eta() { } return *tce_eta_; } -const std::vector &SDL::tce_isDuplicate() { +const std::vector &LSTEff::tce_isDuplicate() { if (not tce_isDuplicate_isLoaded) { if (tce_isDuplicate_branch != 0) { tce_isDuplicate_branch->GetEntry(index); @@ -1902,7 +1902,7 @@ const std::vector &SDL::tce_isDuplicate() { } return *tce_isDuplicate_; } -const std::vector > &SDL::pT5_matched_simIdx() { +const std::vector > &LSTEff::pT5_matched_simIdx() { if (not pT5_matched_simIdx_isLoaded) { if (pT5_matched_simIdx_branch != 0) { pT5_matched_simIdx_branch->GetEntry(index); @@ -1914,7 +1914,7 @@ const std::vector > &SDL::pT5_matched_simIdx() { } return *pT5_matched_simIdx_; } -const std::vector > &SDL::sim_tcIdx() { +const std::vector > &LSTEff::sim_tcIdx() { if (not sim_tcIdx_isLoaded) { if (sim_tcIdx_branch != 0) { sim_tcIdx_branch->GetEntry(index); @@ -1926,7 +1926,7 @@ const std::vector > &SDL::sim_tcIdx() { } return *sim_tcIdx_; } -const std::vector &SDL::t5_phi_2() { +const std::vector &LSTEff::t5_phi_2() { if (not t5_phi_2_isLoaded) { if (t5_phi_2_branch != 0) { t5_phi_2_branch->GetEntry(index); @@ -1938,7 +1938,7 @@ const std::vector &SDL::t5_phi_2() { } return *t5_phi_2_; } -const std::vector &SDL::pureTCE_maxHitMatchedCounts() { +const std::vector &LSTEff::pureTCE_maxHitMatchedCounts() { if (not pureTCE_maxHitMatchedCounts_isLoaded) { if (pureTCE_maxHitMatchedCounts_branch != 0) { pureTCE_maxHitMatchedCounts_branch->GetEntry(index); @@ -1950,7 +1950,7 @@ const std::vector &SDL::pureTCE_maxHitMatchedCounts() { } return *pureTCE_maxHitMatchedCounts_; } -const std::vector > &SDL::t5_matched_simIdx() { +const std::vector > &LSTEff::t5_matched_simIdx() { if (not t5_matched_simIdx_isLoaded) { if (t5_matched_simIdx_branch != 0) { t5_matched_simIdx_branch->GetEntry(index); @@ -1962,7 +1962,7 @@ const std::vector > &SDL::t5_matched_simIdx() { } return *t5_matched_simIdx_; } -const std::vector &SDL::module_subdets() { +const std::vector &LSTEff::module_subdets() { if (not module_subdets_isLoaded) { if (module_subdets_branch != 0) { module_subdets_branch->GetEntry(index); @@ -1974,7 +1974,7 @@ const std::vector &SDL::module_subdets() { } return *module_subdets_; } -const std::vector &SDL::tce_anchorType() { +const std::vector &LSTEff::tce_anchorType() { if (not tce_anchorType_isLoaded) { if (tce_anchorType_branch != 0) { tce_anchorType_branch->GetEntry(index); @@ -1986,7 +1986,7 @@ const std::vector &SDL::tce_anchorType() { } return *tce_anchorType_; } -const std::vector > &SDL::tce_nHitOverlaps() { +const std::vector > &LSTEff::tce_nHitOverlaps() { if (not tce_nHitOverlaps_isLoaded) { if (tce_nHitOverlaps_branch != 0) { tce_nHitOverlaps_branch->GetEntry(index); @@ -1998,7 +1998,7 @@ const std::vector > &SDL::tce_nHitOverlaps() { } return *tce_nHitOverlaps_; } -const std::vector &SDL::t3_isFake() { +const std::vector &LSTEff::t3_isFake() { if (not t3_isFake_isLoaded) { if (t3_isFake_branch != 0) { t3_isFake_branch->GetEntry(index); @@ -2010,7 +2010,7 @@ const std::vector &SDL::t3_isFake() { } return *t3_isFake_; } -const std::vector &SDL::tce_phi() { +const std::vector &LSTEff::tce_phi() { if (not tce_phi_isLoaded) { if (tce_phi_branch != 0) { tce_phi_branch->GetEntry(index); @@ -2022,7 +2022,7 @@ const std::vector &SDL::tce_phi() { } return *tce_phi_; } -const std::vector &SDL::t5_isFake() { +const std::vector &LSTEff::t5_isFake() { if (not t5_isFake_isLoaded) { if (t5_isFake_branch != 0) { t5_isFake_branch->GetEntry(index); @@ -2034,7 +2034,7 @@ const std::vector &SDL::t5_isFake() { } return *t5_isFake_; } -const std::vector &SDL::md_occupancies() { +const std::vector &LSTEff::md_occupancies() { if (not md_occupancies_isLoaded) { if (md_occupancies_branch != 0) { md_occupancies_branch->GetEntry(index); @@ -2046,7 +2046,7 @@ const std::vector &SDL::md_occupancies() { } return *md_occupancies_; } -const std::vector > &SDL::t5_hitIdxs() { +const std::vector > &LSTEff::t5_hitIdxs() { if (not t5_hitIdxs_isLoaded) { if (t5_hitIdxs_branch != 0) { t5_hitIdxs_branch->GetEntry(index); @@ -2058,7 +2058,7 @@ const std::vector > &SDL::t5_hitIdxs() { } return *t5_hitIdxs_; } -const std::vector > &SDL::sim_pT3_types() { +const std::vector > &LSTEff::sim_pT3_types() { if (not sim_pT3_types_isLoaded) { if (sim_pT3_types_branch != 0) { sim_pT3_types_branch->GetEntry(index); @@ -2070,7 +2070,7 @@ const std::vector > &SDL::sim_pT3_types() { } return *sim_pT3_types_; } -const std::vector > &SDL::sim_pureTCE_types() { +const std::vector > &LSTEff::sim_pureTCE_types() { if (not sim_pureTCE_types_isLoaded) { if (sim_pureTCE_types_branch != 0) { sim_pureTCE_types_branch->GetEntry(index); @@ -2082,7 +2082,7 @@ const std::vector > &SDL::sim_pureTCE_types() { } return *sim_pureTCE_types_; } -const std::vector &SDL::t4_phi() { +const std::vector &LSTEff::t4_phi() { if (not t4_phi_isLoaded) { if (t4_phi_branch != 0) { t4_phi_branch->GetEntry(index); @@ -2094,7 +2094,7 @@ const std::vector &SDL::t4_phi() { } return *t4_phi_; } -const std::vector &SDL::t5_phi() { +const std::vector &LSTEff::t5_phi() { if (not t5_phi_isLoaded) { if (t5_phi_branch != 0) { t5_phi_branch->GetEntry(index); @@ -2106,7 +2106,7 @@ const std::vector &SDL::t5_phi() { } return *t5_phi_; } -const std::vector > &SDL::pT5_hitIdxs() { +const std::vector > &LSTEff::pT5_hitIdxs() { if (not pT5_hitIdxs_isLoaded) { if (pT5_hitIdxs_branch != 0) { pT5_hitIdxs_branch->GetEntry(index); @@ -2118,7 +2118,7 @@ const std::vector > &SDL::pT5_hitIdxs() { } return *pT5_hitIdxs_; } -const std::vector &SDL::t5_pt() { +const std::vector &LSTEff::t5_pt() { if (not t5_pt_isLoaded) { if (t5_pt_branch != 0) { t5_pt_branch->GetEntry(index); @@ -2130,7 +2130,7 @@ const std::vector &SDL::t5_pt() { } return *t5_pt_; } -const std::vector &SDL::pT5_phi() { +const std::vector &LSTEff::pT5_phi() { if (not pT5_phi_isLoaded) { if (pT5_phi_branch != 0) { pT5_phi_branch->GetEntry(index); @@ -2142,7 +2142,7 @@ const std::vector &SDL::pT5_phi() { } return *pT5_phi_; } -const std::vector &SDL::pureTCE_isFake() { +const std::vector &LSTEff::pureTCE_isFake() { if (not pureTCE_isFake_isLoaded) { if (pureTCE_isFake_branch != 0) { pureTCE_isFake_branch->GetEntry(index); @@ -2154,7 +2154,7 @@ const std::vector &SDL::pureTCE_isFake() { } return *pureTCE_isFake_; } -const std::vector &SDL::tce_pt() { +const std::vector &LSTEff::tce_pt() { if (not tce_pt_isLoaded) { if (tce_pt_branch != 0) { tce_pt_branch->GetEntry(index); @@ -2166,7 +2166,7 @@ const std::vector &SDL::tce_pt() { } return *tce_pt_; } -const std::vector &SDL::tc_isFake() { +const std::vector &LSTEff::tc_isFake() { if (not tc_isFake_isLoaded) { if (tc_isFake_branch != 0) { tc_isFake_branch->GetEntry(index); @@ -2178,7 +2178,7 @@ const std::vector &SDL::tc_isFake() { } return *tc_isFake_; } -const std::vector &SDL::pT3_isFake() { +const std::vector &LSTEff::pT3_isFake() { if (not pT3_isFake_isLoaded) { if (pT3_isFake_branch != 0) { pT3_isFake_branch->GetEntry(index); @@ -2190,7 +2190,7 @@ const std::vector &SDL::pT3_isFake() { } return *pT3_isFake_; } -const std::vector > &SDL::tce_nLayerOverlaps() { +const std::vector > &LSTEff::tce_nLayerOverlaps() { if (not tce_nLayerOverlaps_isLoaded) { if (tce_nLayerOverlaps_branch != 0) { tce_nLayerOverlaps_branch->GetEntry(index); @@ -2202,7 +2202,7 @@ const std::vector > &SDL::tce_nLayerOverlaps() { } return *tce_nLayerOverlaps_; } -const std::vector &SDL::tc_sim() { +const std::vector &LSTEff::tc_sim() { if (not tc_sim_isLoaded) { if (tc_sim_branch != 0) { tc_sim_branch->GetEntry(index); @@ -2214,7 +2214,7 @@ const std::vector &SDL::tc_sim() { } return *tc_sim_; } -const std::vector > &SDL::sim_pLS_types() { +const std::vector > &LSTEff::sim_pLS_types() { if (not sim_pLS_types_isLoaded) { if (sim_pLS_types_branch != 0) { sim_pLS_types_branch->GetEntry(index); @@ -2226,7 +2226,7 @@ const std::vector > &SDL::sim_pLS_types() { } return *sim_pLS_types_; } -const std::vector &SDL::sim_pca_dxy() { +const std::vector &LSTEff::sim_pca_dxy() { if (not sim_pca_dxy_isLoaded) { if (sim_pca_dxy_branch != 0) { sim_pca_dxy_branch->GetEntry(index); @@ -2238,7 +2238,7 @@ const std::vector &SDL::sim_pca_dxy() { } return *sim_pca_dxy_; } -const std::vector &SDL::pT4_phi() { +const std::vector &LSTEff::pT4_phi() { if (not pT4_phi_isLoaded) { if (pT4_phi_branch != 0) { pT4_phi_branch->GetEntry(index); @@ -2250,7 +2250,7 @@ const std::vector &SDL::pT4_phi() { } return *pT4_phi_; } -const std::vector &SDL::sim_hits() { +const std::vector &LSTEff::sim_hits() { if (not sim_hits_isLoaded) { if (sim_hits_branch != 0) { sim_hits_branch->GetEntry(index); @@ -2262,7 +2262,7 @@ const std::vector &SDL::sim_hits() { } return *sim_hits_; } -const std::vector &SDL::pLS_phi() { +const std::vector &LSTEff::pLS_phi() { if (not pLS_phi_isLoaded) { if (pLS_phi_branch != 0) { pLS_phi_branch->GetEntry(index); @@ -2274,7 +2274,7 @@ const std::vector &SDL::pLS_phi() { } return *pLS_phi_; } -const std::vector &SDL::sim_pureTCE_matched() { +const std::vector &LSTEff::sim_pureTCE_matched() { if (not sim_pureTCE_matched_isLoaded) { if (sim_pureTCE_matched_branch != 0) { sim_pureTCE_matched_branch->GetEntry(index); @@ -2286,7 +2286,7 @@ const std::vector &SDL::sim_pureTCE_matched() { } return *sim_pureTCE_matched_; } -const std::vector &SDL::t3_occupancies() { +const std::vector &LSTEff::t3_occupancies() { if (not t3_occupancies_isLoaded) { if (t3_occupancies_branch != 0) { t3_occupancies_branch->GetEntry(index); @@ -2298,7 +2298,7 @@ const std::vector &SDL::t3_occupancies() { } return *t3_occupancies_; } -const std::vector &SDL::t5_foundDuplicate() { +const std::vector &LSTEff::t5_foundDuplicate() { if (not t5_foundDuplicate_isLoaded) { if (t5_foundDuplicate_branch != 0) { t5_foundDuplicate_branch->GetEntry(index); @@ -2310,7 +2310,7 @@ const std::vector &SDL::t5_foundDuplicate() { } return *t5_foundDuplicate_; } -const std::vector > &SDL::sim_pT4_types() { +const std::vector > &LSTEff::sim_pT4_types() { if (not sim_pT4_types_isLoaded) { if (sim_pT4_types_branch != 0) { sim_pT4_types_branch->GetEntry(index); @@ -2322,7 +2322,7 @@ const std::vector > &SDL::sim_pT4_types() { } return *sim_pT4_types_; } -const std::vector &SDL::t4_isFake() { +const std::vector &LSTEff::t4_isFake() { if (not t4_isFake_isLoaded) { if (t4_isFake_branch != 0) { t4_isFake_branch->GetEntry(index); @@ -2334,7 +2334,7 @@ const std::vector &SDL::t4_isFake() { } return *t4_isFake_; } -const std::vector &SDL::simvtx_x() { +const std::vector &LSTEff::simvtx_x() { if (not simvtx_x_isLoaded) { if (simvtx_x_branch != 0) { simvtx_x_branch->GetEntry(index); @@ -2346,7 +2346,7 @@ const std::vector &SDL::simvtx_x() { } return *simvtx_x_; } -const std::vector &SDL::simvtx_y() { +const std::vector &LSTEff::simvtx_y() { if (not simvtx_y_isLoaded) { if (simvtx_y_branch != 0) { simvtx_y_branch->GetEntry(index); @@ -2358,7 +2358,7 @@ const std::vector &SDL::simvtx_y() { } return *simvtx_y_; } -const std::vector &SDL::simvtx_z() { +const std::vector &LSTEff::simvtx_z() { if (not simvtx_z_isLoaded) { if (simvtx_z_branch != 0) { simvtx_z_branch->GetEntry(index); @@ -2370,7 +2370,7 @@ const std::vector &SDL::simvtx_z() { } return *simvtx_z_; } -const std::vector &SDL::sim_T4_matched() { +const std::vector &LSTEff::sim_T4_matched() { if (not sim_T4_matched_isLoaded) { if (sim_T4_matched_branch != 0) { sim_T4_matched_branch->GetEntry(index); @@ -2382,7 +2382,7 @@ const std::vector &SDL::sim_T4_matched() { } return *sim_T4_matched_; } -const std::vector &SDL::sim_isGood() { +const std::vector &LSTEff::sim_isGood() { if (not sim_isGood_isLoaded) { if (sim_isGood_branch != 0) { sim_isGood_branch->GetEntry(index); @@ -2394,7 +2394,7 @@ const std::vector &SDL::sim_isGood() { } return *sim_isGood_; } -const std::vector &SDL::pT3_pt() { +const std::vector &LSTEff::pT3_pt() { if (not pT3_pt_isLoaded) { if (pT3_pt_branch != 0) { pT3_pt_branch->GetEntry(index); @@ -2406,7 +2406,7 @@ const std::vector &SDL::pT3_pt() { } return *pT3_pt_; } -const std::vector &SDL::tc_pt() { +const std::vector &LSTEff::tc_pt() { if (not tc_pt_isLoaded) { if (tc_pt_branch != 0) { tc_pt_branch->GetEntry(index); @@ -2418,7 +2418,7 @@ const std::vector &SDL::tc_pt() { } return *tc_pt_; } -const std::vector &SDL::pT3_phi_2() { +const std::vector &LSTEff::pT3_phi_2() { if (not pT3_phi_2_isLoaded) { if (pT3_phi_2_branch != 0) { pT3_phi_2_branch->GetEntry(index); @@ -2430,7 +2430,7 @@ const std::vector &SDL::pT3_phi_2() { } return *pT3_phi_2_; } -const std::vector &SDL::pT5_pt() { +const std::vector &LSTEff::pT5_pt() { if (not pT5_pt_isLoaded) { if (pT5_pt_branch != 0) { pT5_pt_branch->GetEntry(index); @@ -2442,7 +2442,7 @@ const std::vector &SDL::pT5_pt() { } return *pT5_pt_; } -const std::vector &SDL::pureTCE_rPhiChiSquared() { +const std::vector &LSTEff::pureTCE_rPhiChiSquared() { if (not pureTCE_rPhiChiSquared_isLoaded) { if (pureTCE_rPhiChiSquared_branch != 0) { pureTCE_rPhiChiSquared_branch->GetEntry(index); @@ -2454,7 +2454,7 @@ const std::vector &SDL::pureTCE_rPhiChiSquared() { } return *pureTCE_rPhiChiSquared_; } -const std::vector &SDL::pT5_score() { +const std::vector &LSTEff::pT5_score() { if (not pT5_score_isLoaded) { if (pT5_score_branch != 0) { pT5_score_branch->GetEntry(index); @@ -2466,7 +2466,7 @@ const std::vector &SDL::pT5_score() { } return *pT5_score_; } -const std::vector &SDL::sim_phi() { +const std::vector &LSTEff::sim_phi() { if (not sim_phi_isLoaded) { if (sim_phi_branch != 0) { sim_phi_branch->GetEntry(index); @@ -2478,7 +2478,7 @@ const std::vector &SDL::sim_phi() { } return *sim_phi_; } -const std::vector &SDL::pT5_isFake() { +const std::vector &LSTEff::pT5_isFake() { if (not pT5_isFake_isLoaded) { if (pT5_isFake_branch != 0) { pT5_isFake_branch->GetEntry(index); @@ -2490,7 +2490,7 @@ const std::vector &SDL::pT5_isFake() { } return *pT5_isFake_; } -const std::vector &SDL::tc_maxHitMatchedCounts() { +const std::vector &LSTEff::tc_maxHitMatchedCounts() { if (not tc_maxHitMatchedCounts_isLoaded) { if (tc_maxHitMatchedCounts_branch != 0) { tc_maxHitMatchedCounts_branch->GetEntry(index); @@ -2502,7 +2502,7 @@ const std::vector &SDL::tc_maxHitMatchedCounts() { } return *tc_maxHitMatchedCounts_; } -const std::vector > &SDL::pureTCE_nLayerOverlaps() { +const std::vector > &LSTEff::pureTCE_nLayerOverlaps() { if (not pureTCE_nLayerOverlaps_isLoaded) { if (pureTCE_nLayerOverlaps_branch != 0) { pureTCE_nLayerOverlaps_branch->GetEntry(index); @@ -2514,7 +2514,7 @@ const std::vector > &SDL::pureTCE_nLayerOverlaps() { } return *pureTCE_nLayerOverlaps_; } -const std::vector &SDL::sim_pca_dz() { +const std::vector &LSTEff::sim_pca_dz() { if (not sim_pca_dz_isLoaded) { if (sim_pca_dz_branch != 0) { sim_pca_dz_branch->GetEntry(index); @@ -2526,7 +2526,7 @@ const std::vector &SDL::sim_pca_dz() { } return *sim_pca_dz_; } -const std::vector > &SDL::pureTCE_hitIdxs() { +const std::vector > &LSTEff::pureTCE_hitIdxs() { if (not pureTCE_hitIdxs_isLoaded) { if (pureTCE_hitIdxs_branch != 0) { pureTCE_hitIdxs_branch->GetEntry(index); @@ -2538,7 +2538,7 @@ const std::vector > &SDL::pureTCE_hitIdxs() { } return *pureTCE_hitIdxs_; } -const std::vector > &SDL::pureTCE_nHitOverlaps() { +const std::vector > &LSTEff::pureTCE_nHitOverlaps() { if (not pureTCE_nHitOverlaps_isLoaded) { if (pureTCE_nHitOverlaps_branch != 0) { pureTCE_nHitOverlaps_branch->GetEntry(index); @@ -2550,7 +2550,7 @@ const std::vector > &SDL::pureTCE_nHitOverlaps() { } return *pureTCE_nHitOverlaps_; } -const std::vector &SDL::sim_pLS_matched() { +const std::vector &LSTEff::sim_pLS_matched() { if (not sim_pLS_matched_isLoaded) { if (sim_pLS_matched_branch != 0) { sim_pLS_matched_branch->GetEntry(index); @@ -2562,7 +2562,7 @@ const std::vector &SDL::sim_pLS_matched() { } return *sim_pLS_matched_; } -const std::vector > &SDL::tc_matched_simIdx() { +const std::vector > &LSTEff::tc_matched_simIdx() { if (not tc_matched_simIdx_isLoaded) { if (tc_matched_simIdx_branch != 0) { tc_matched_simIdx_branch->GetEntry(index); @@ -2574,7 +2574,7 @@ const std::vector > &SDL::tc_matched_simIdx() { } return *tc_matched_simIdx_; } -const std::vector &SDL::sim_T3_matched() { +const std::vector &LSTEff::sim_T3_matched() { if (not sim_T3_matched_isLoaded) { if (sim_T3_matched_branch != 0) { sim_T3_matched_branch->GetEntry(index); @@ -2586,7 +2586,7 @@ const std::vector &SDL::sim_T3_matched() { } return *sim_T3_matched_; } -const std::vector &SDL::pLS_score() { +const std::vector &LSTEff::pLS_score() { if (not pLS_score_isLoaded) { if (pLS_score_branch != 0) { pLS_score_branch->GetEntry(index); @@ -2598,7 +2598,7 @@ const std::vector &SDL::pLS_score() { } return *pLS_score_; } -const std::vector &SDL::pT3_phi() { +const std::vector &LSTEff::pT3_phi() { if (not pT3_phi_isLoaded) { if (pT3_phi_branch != 0) { pT3_phi_branch->GetEntry(index); @@ -2610,7 +2610,7 @@ const std::vector &SDL::pT3_phi() { } return *pT3_phi_; } -const std::vector &SDL::pT5_eta() { +const std::vector &LSTEff::pT5_eta() { if (not pT5_eta_isLoaded) { if (pT5_eta_branch != 0) { pT5_eta_branch->GetEntry(index); @@ -2622,7 +2622,7 @@ const std::vector &SDL::pT5_eta() { } return *pT5_eta_; } -const std::vector &SDL::tc_phi() { +const std::vector &LSTEff::tc_phi() { if (not tc_phi_isLoaded) { if (tc_phi_branch != 0) { tc_phi_branch->GetEntry(index); @@ -2634,7 +2634,7 @@ const std::vector &SDL::tc_phi() { } return *tc_phi_; } -const std::vector &SDL::t4_eta() { +const std::vector &LSTEff::t4_eta() { if (not t4_eta_isLoaded) { if (t4_eta_branch != 0) { t4_eta_branch->GetEntry(index); @@ -2646,7 +2646,7 @@ const std::vector &SDL::t4_eta() { } return *t4_eta_; } -const std::vector &SDL::pLS_isFake() { +const std::vector &LSTEff::pLS_isFake() { if (not pLS_isFake_isLoaded) { if (pLS_isFake_branch != 0) { pLS_isFake_branch->GetEntry(index); @@ -2658,7 +2658,7 @@ const std::vector &SDL::pLS_isFake() { } return *pLS_isFake_; } -const std::vector > &SDL::pureTCE_matched_simIdx() { +const std::vector > &LSTEff::pureTCE_matched_simIdx() { if (not pureTCE_matched_simIdx_isLoaded) { if (pureTCE_matched_simIdx_branch != 0) { pureTCE_matched_simIdx_branch->GetEntry(index); @@ -2670,7 +2670,7 @@ const std::vector > &SDL::pureTCE_matched_simIdx() { } return *pureTCE_matched_simIdx_; } -const std::vector &SDL::sim_bunchCrossing() { +const std::vector &LSTEff::sim_bunchCrossing() { if (not sim_bunchCrossing_isLoaded) { if (sim_bunchCrossing_branch != 0) { sim_bunchCrossing_branch->GetEntry(index); @@ -2682,7 +2682,7 @@ const std::vector &SDL::sim_bunchCrossing() { } return *sim_bunchCrossing_; } -const std::vector &SDL::tc_partOfExtension() { +const std::vector &LSTEff::tc_partOfExtension() { if (not tc_partOfExtension_isLoaded) { if (tc_partOfExtension_branch != 0) { tc_partOfExtension_branch->GetEntry(index); @@ -2694,7 +2694,7 @@ const std::vector &SDL::tc_partOfExtension() { } return *tc_partOfExtension_; } -const std::vector &SDL::pT3_eta() { +const std::vector &LSTEff::pT3_eta() { if (not pT3_eta_isLoaded) { if (pT3_eta_branch != 0) { pT3_eta_branch->GetEntry(index); @@ -2706,7 +2706,7 @@ const std::vector &SDL::pT3_eta() { } return *pT3_eta_; } -const std::vector &SDL::sim_parentVtxIdx() { +const std::vector &LSTEff::sim_parentVtxIdx() { if (not sim_parentVtxIdx_isLoaded) { if (sim_parentVtxIdx_branch != 0) { sim_parentVtxIdx_branch->GetEntry(index); @@ -2718,7 +2718,7 @@ const std::vector &SDL::sim_parentVtxIdx() { } return *sim_parentVtxIdx_; } -const std::vector &SDL::pureTCE_layer_binary() { +const std::vector &LSTEff::pureTCE_layer_binary() { if (not pureTCE_layer_binary_isLoaded) { if (pureTCE_layer_binary_branch != 0) { pureTCE_layer_binary_branch->GetEntry(index); @@ -2730,7 +2730,7 @@ const std::vector &SDL::pureTCE_layer_binary() { } return *pureTCE_layer_binary_; } -const std::vector &SDL::sim_pT4_matched() { +const std::vector &LSTEff::sim_pT4_matched() { if (not sim_pT4_matched_isLoaded) { if (sim_pT4_matched_branch != 0) { sim_pT4_matched_branch->GetEntry(index); @@ -2742,7 +2742,7 @@ const std::vector &SDL::sim_pT4_matched() { } return *sim_pT4_matched_; } -const std::vector &SDL::tc_eta() { +const std::vector &LSTEff::tc_eta() { if (not tc_eta_isLoaded) { if (tc_eta_branch != 0) { tc_eta_branch->GetEntry(index); @@ -2754,7 +2754,7 @@ const std::vector &SDL::tc_eta() { } return *tc_eta_; } -const std::vector &SDL::sim_lengap() { +const std::vector &LSTEff::sim_lengap() { if (not sim_lengap_isLoaded) { if (sim_lengap_branch != 0) { sim_lengap_branch->GetEntry(index); @@ -2766,7 +2766,7 @@ const std::vector &SDL::sim_lengap() { } return *sim_lengap_; } -const std::vector &SDL::sim_T5_matched() { +const std::vector &LSTEff::sim_T5_matched() { if (not sim_T5_matched_isLoaded) { if (sim_T5_matched_branch != 0) { sim_T5_matched_branch->GetEntry(index); @@ -2778,7 +2778,7 @@ const std::vector &SDL::sim_T5_matched() { } return *sim_T5_matched_; } -const std::vector > &SDL::sim_T5_types() { +const std::vector > &LSTEff::sim_T5_types() { if (not sim_T5_types_isLoaded) { if (sim_T5_types_branch != 0) { sim_T5_types_branch->GetEntry(index); @@ -2790,7 +2790,7 @@ const std::vector > &SDL::sim_T5_types() { } return *sim_T5_types_; } -const std::vector > &SDL::tce_matched_simIdx() { +const std::vector > &LSTEff::tce_matched_simIdx() { if (not tce_matched_simIdx_isLoaded) { if (tce_matched_simIdx_branch != 0) { tce_matched_simIdx_branch->GetEntry(index); @@ -2802,7 +2802,7 @@ const std::vector > &SDL::tce_matched_simIdx() { } return *tce_matched_simIdx_; } -const std::vector &SDL::t5_isDuplicate() { +const std::vector &LSTEff::t5_isDuplicate() { if (not t5_isDuplicate_isLoaded) { if (t5_isDuplicate_branch != 0) { t5_isDuplicate_branch->GetEntry(index); @@ -2814,7 +2814,7 @@ const std::vector &SDL::t5_isDuplicate() { } return *t5_isDuplicate_; } -const std::vector > &SDL::pT3_hitIdxs() { +const std::vector > &LSTEff::pT3_hitIdxs() { if (not pT3_hitIdxs_isLoaded) { if (pT3_hitIdxs_branch != 0) { pT3_hitIdxs_branch->GetEntry(index); @@ -2826,7 +2826,7 @@ const std::vector > &SDL::pT3_hitIdxs() { } return *pT3_hitIdxs_; } -const std::vector > &SDL::tc_hitIdxs() { +const std::vector > &LSTEff::tc_hitIdxs() { if (not tc_hitIdxs_isLoaded) { if (tc_hitIdxs_branch != 0) { tc_hitIdxs_branch->GetEntry(index); @@ -2838,7 +2838,7 @@ const std::vector > &SDL::tc_hitIdxs() { } return *tc_hitIdxs_; } -const int &SDL::pT3_occupancies() { +const int &LSTEff::pT3_occupancies() { if (not pT3_occupancies_isLoaded) { if (pT3_occupancies_branch != 0) { pT3_occupancies_branch->GetEntry(index); @@ -2850,7 +2850,7 @@ const int &SDL::pT3_occupancies() { } return pT3_occupancies_; } -const int &SDL::tc_occupancies() { +const int &LSTEff::tc_occupancies() { if (not tc_occupancies_isLoaded) { if (tc_occupancies_branch != 0) { tc_occupancies_branch->GetEntry(index); @@ -2862,7 +2862,7 @@ const int &SDL::tc_occupancies() { } return tc_occupancies_; } -const std::vector &SDL::sim_TC_matched() { +const std::vector &LSTEff::sim_TC_matched() { if (not sim_TC_matched_isLoaded) { if (sim_TC_matched_branch != 0) { sim_TC_matched_branch->GetEntry(index); @@ -2874,7 +2874,7 @@ const std::vector &SDL::sim_TC_matched() { } return *sim_TC_matched_; } -const std::vector &SDL::sim_TC_matched_mask() { +const std::vector &LSTEff::sim_TC_matched_mask() { if (not sim_TC_matched_mask_isLoaded) { if (sim_TC_matched_mask_branch != 0) { sim_TC_matched_mask_branch->GetEntry(index); @@ -2886,7 +2886,7 @@ const std::vector &SDL::sim_TC_matched_mask() { } return *sim_TC_matched_mask_; } -const std::vector &SDL::pLS_isDuplicate() { +const std::vector &LSTEff::pLS_isDuplicate() { if (not pLS_isDuplicate_isLoaded) { if (pLS_isDuplicate_branch != 0) { pLS_isDuplicate_branch->GetEntry(index); @@ -2898,7 +2898,7 @@ const std::vector &SDL::pLS_isDuplicate() { } return *pLS_isDuplicate_; } -const std::vector &SDL::tce_anchorIndex() { +const std::vector &LSTEff::tce_anchorIndex() { if (not tce_anchorIndex_isLoaded) { if (tce_anchorIndex_branch != 0) { tce_anchorIndex_branch->GetEntry(index); @@ -2910,7 +2910,7 @@ const std::vector &SDL::tce_anchorIndex() { } return *tce_anchorIndex_; } -const std::vector &SDL::t5_occupancies() { +const std::vector &LSTEff::t5_occupancies() { if (not t5_occupancies_isLoaded) { if (t5_occupancies_branch != 0) { t5_occupancies_branch->GetEntry(index); @@ -2922,7 +2922,7 @@ const std::vector &SDL::t5_occupancies() { } return *t5_occupancies_; } -const std::vector &SDL::tc_type() { +const std::vector &LSTEff::tc_type() { if (not tc_type_isLoaded) { if (tc_type_branch != 0) { tc_type_branch->GetEntry(index); @@ -2934,7 +2934,7 @@ const std::vector &SDL::tc_type() { } return *tc_type_; } -const std::vector &SDL::tce_isFake() { +const std::vector &LSTEff::tce_isFake() { if (not tce_isFake_isLoaded) { if (tce_isFake_branch != 0) { tce_isFake_branch->GetEntry(index); @@ -2946,7 +2946,7 @@ const std::vector &SDL::tce_isFake() { } return *tce_isFake_; } -const std::vector &SDL::pLS_pt() { +const std::vector &LSTEff::pLS_pt() { if (not pLS_pt_isLoaded) { if (pLS_pt_branch != 0) { pLS_pt_branch->GetEntry(index); @@ -2958,7 +2958,7 @@ const std::vector &SDL::pLS_pt() { } return *pLS_pt_; } -const std::vector &SDL::pureTCE_anchorIndex() { +const std::vector &LSTEff::pureTCE_anchorIndex() { if (not pureTCE_anchorIndex_isLoaded) { if (pureTCE_anchorIndex_branch != 0) { pureTCE_anchorIndex_branch->GetEntry(index); @@ -2970,7 +2970,7 @@ const std::vector &SDL::pureTCE_anchorIndex() { } return *pureTCE_anchorIndex_; } -const std::vector > &SDL::sim_T4_types() { +const std::vector > &LSTEff::sim_T4_types() { if (not sim_T4_types_isLoaded) { if (sim_T4_types_branch != 0) { sim_T4_types_branch->GetEntry(index); @@ -2982,7 +2982,7 @@ const std::vector > &SDL::sim_T4_types() { } return *sim_T4_types_; } -const std::vector &SDL::pT4_isDuplicate() { +const std::vector &LSTEff::pT4_isDuplicate() { if (not pT4_isDuplicate_isLoaded) { if (pT4_isDuplicate_branch != 0) { pT4_isDuplicate_branch->GetEntry(index); @@ -2994,7 +2994,7 @@ const std::vector &SDL::pT4_isDuplicate() { } return *pT4_isDuplicate_; } -const std::vector &SDL::t4_pt() { +const std::vector &LSTEff::t4_pt() { if (not t4_pt_isLoaded) { if (t4_pt_branch != 0) { t4_pt_branch->GetEntry(index); @@ -3006,7 +3006,7 @@ const std::vector &SDL::t4_pt() { } return *t4_pt_; } -const std::vector > &SDL::sim_TC_types() { +const std::vector > &LSTEff::sim_TC_types() { if (not sim_TC_types_isLoaded) { if (sim_TC_types_branch != 0) { sim_TC_types_branch->GetEntry(index); @@ -3018,7 +3018,7 @@ const std::vector > &SDL::sim_TC_types() { } return *sim_TC_types_; } -const std::vector &SDL::sg_occupancies() { +const std::vector &LSTEff::sg_occupancies() { if (not sg_occupancies_isLoaded) { if (sg_occupancies_branch != 0) { sg_occupancies_branch->GetEntry(index); @@ -3030,7 +3030,7 @@ const std::vector &SDL::sg_occupancies() { } return *sg_occupancies_; } -const std::vector &SDL::pT4_pt() { +const std::vector &LSTEff::pT4_pt() { if (not pT4_pt_isLoaded) { if (pT4_pt_branch != 0) { pT4_pt_branch->GetEntry(index); @@ -3042,7 +3042,7 @@ const std::vector &SDL::pT4_pt() { } return *pT4_pt_; } -const std::vector &SDL::pureTCE_phi() { +const std::vector &LSTEff::pureTCE_phi() { if (not pureTCE_phi_isLoaded) { if (pureTCE_phi_branch != 0) { pureTCE_phi_branch->GetEntry(index); @@ -3054,7 +3054,7 @@ const std::vector &SDL::pureTCE_phi() { } return *pureTCE_phi_; } -const std::vector &SDL::sim_vx() { +const std::vector &LSTEff::sim_vx() { if (not sim_vx_isLoaded) { if (sim_vx_branch != 0) { sim_vx_branch->GetEntry(index); @@ -3066,7 +3066,7 @@ const std::vector &SDL::sim_vx() { } return *sim_vx_; } -const std::vector &SDL::sim_vy() { +const std::vector &LSTEff::sim_vy() { if (not sim_vy_isLoaded) { if (sim_vy_branch != 0) { sim_vy_branch->GetEntry(index); @@ -3078,7 +3078,7 @@ const std::vector &SDL::sim_vy() { } return *sim_vy_; } -const std::vector &SDL::sim_vz() { +const std::vector &LSTEff::sim_vz() { if (not sim_vz_isLoaded) { if (sim_vz_branch != 0) { sim_vz_branch->GetEntry(index); @@ -3090,7 +3090,7 @@ const std::vector &SDL::sim_vz() { } return *sim_vz_; } -const std::vector &SDL::tce_maxHitMatchedCounts() { +const std::vector &LSTEff::tce_maxHitMatchedCounts() { if (not tce_maxHitMatchedCounts_isLoaded) { if (tce_maxHitMatchedCounts_branch != 0) { tce_maxHitMatchedCounts_branch->GetEntry(index); @@ -3102,7 +3102,7 @@ const std::vector &SDL::tce_maxHitMatchedCounts() { } return *tce_maxHitMatchedCounts_; } -const std::vector &SDL::t3_pt() { +const std::vector &LSTEff::t3_pt() { if (not t3_pt_isLoaded) { if (t3_pt_branch != 0) { t3_pt_branch->GetEntry(index); @@ -3114,7 +3114,7 @@ const std::vector &SDL::t3_pt() { } return *t3_pt_; } -const std::vector &SDL::module_rings() { +const std::vector &LSTEff::module_rings() { if (not module_rings_isLoaded) { if (module_rings_branch != 0) { module_rings_branch->GetEntry(index); @@ -3126,7 +3126,7 @@ const std::vector &SDL::module_rings() { } return *module_rings_; } -const std::vector > &SDL::sim_T3_types() { +const std::vector > &LSTEff::sim_T3_types() { if (not sim_T3_types_isLoaded) { if (sim_T3_types_branch != 0) { sim_T3_types_branch->GetEntry(index); @@ -3138,7 +3138,7 @@ const std::vector > &SDL::sim_T3_types() { } return *sim_T3_types_; } -const std::vector > &SDL::sim_pT5_types() { +const std::vector > &LSTEff::sim_pT5_types() { if (not sim_pT5_types_isLoaded) { if (sim_pT5_types_branch != 0) { sim_pT5_types_branch->GetEntry(index); @@ -3150,7 +3150,7 @@ const std::vector > &SDL::sim_pT5_types() { } return *sim_pT5_types_; } -const std::vector &SDL::sim_pT5_matched() { +const std::vector &LSTEff::sim_pT5_matched() { if (not sim_pT5_matched_isLoaded) { if (sim_pT5_matched_branch != 0) { sim_pT5_matched_branch->GetEntry(index); @@ -3162,7 +3162,7 @@ const std::vector &SDL::sim_pT5_matched() { } return *sim_pT5_matched_; } -const std::vector &SDL::module_layers() { +const std::vector &LSTEff::module_layers() { if (not module_layers_isLoaded) { if (module_layers_branch != 0) { module_layers_branch->GetEntry(index); @@ -3174,7 +3174,7 @@ const std::vector &SDL::module_layers() { } return *module_layers_; } -const std::vector &SDL::pT4_eta() { +const std::vector &LSTEff::pT4_eta() { if (not pT4_eta_isLoaded) { if (pT4_eta_branch != 0) { pT4_eta_branch->GetEntry(index); @@ -3186,7 +3186,7 @@ const std::vector &SDL::pT4_eta() { } return *pT4_eta_; } -const std::vector > &SDL::sim_tce_types() { +const std::vector > &LSTEff::sim_tce_types() { if (not sim_tce_types_isLoaded) { if (sim_tce_types_branch != 0) { sim_tce_types_branch->GetEntry(index); @@ -3198,7 +3198,7 @@ const std::vector > &SDL::sim_tce_types() { } return *sim_tce_types_; } -const std::vector &SDL::tce_rzChiSquared() { +const std::vector &LSTEff::tce_rzChiSquared() { if (not tce_rzChiSquared_isLoaded) { if (tce_rzChiSquared_branch != 0) { tce_rzChiSquared_branch->GetEntry(index); @@ -3210,7 +3210,7 @@ const std::vector &SDL::tce_rzChiSquared() { } return *tce_rzChiSquared_; } -const std::vector > &SDL::pT3_matched_simIdx() { +const std::vector > &LSTEff::pT3_matched_simIdx() { if (not pT3_matched_simIdx_isLoaded) { if (pT3_matched_simIdx_branch != 0) { pT3_matched_simIdx_branch->GetEntry(index); @@ -3222,7 +3222,7 @@ const std::vector > &SDL::pT3_matched_simIdx() { } return *pT3_matched_simIdx_; } -void SDL::progress(int nEventsTotal, int nEventsChain) { +void LSTEff::progress(int nEventsTotal, int nEventsChain) { int period = 1000; if (nEventsTotal % 1000 == 0) { if (isatty(1)) { @@ -3244,150 +3244,150 @@ void SDL::progress(int nEventsTotal, int nEventsChain) { } } namespace tas { - const int &pT5_occupancies() { return sdl.pT5_occupancies(); } - const std::vector &t3_phi() { return sdl.t3_phi(); } - const std::vector &t5_score_rphisum() { return sdl.t5_score_rphisum(); } - const std::vector &pT4_isFake() { return sdl.pT4_isFake(); } - const std::vector &t3_isDuplicate() { return sdl.t3_isDuplicate(); } - const std::vector &sim_event() { return sdl.sim_event(); } - const std::vector &sim_q() { return sdl.sim_q(); } - const std::vector &sim_eta() { return sdl.sim_eta(); } - const std::vector &pT3_foundDuplicate() { return sdl.pT3_foundDuplicate(); } - const std::vector &sim_len() { return sdl.sim_len(); } - const std::vector &pureTCE_isDuplicate() { return sdl.pureTCE_isDuplicate(); } - const std::vector &pT3_score() { return sdl.pT3_score(); } - const std::vector &t5_eta() { return sdl.t5_eta(); } - const std::vector &sim_denom() { return sdl.sim_denom(); } - const std::vector &pT5_isDuplicate() { return sdl.pT5_isDuplicate(); } - const std::vector &sim_tce_matched() { return sdl.sim_tce_matched(); } - const std::vector &pT3_isDuplicate() { return sdl.pT3_isDuplicate(); } - const std::vector &tc_isDuplicate() { return sdl.tc_isDuplicate(); } - const std::vector &pT3_eta_2() { return sdl.pT3_eta_2(); } - const std::vector &sim_pT3_matched() { return sdl.sim_pT3_matched(); } - const std::vector &pureTCE_rzChiSquared() { return sdl.pureTCE_rzChiSquared(); } - const std::vector &t4_isDuplicate() { return sdl.t4_isDuplicate(); } - const std::vector &pureTCE_eta() { return sdl.pureTCE_eta(); } - const std::vector &tce_rPhiChiSquared() { return sdl.tce_rPhiChiSquared(); } - const std::vector &pureTCE_anchorType() { return sdl.pureTCE_anchorType(); } - const std::vector &pureTCE_pt() { return sdl.pureTCE_pt(); } - const std::vector &sim_pt() { return sdl.sim_pt(); } - const std::vector &t5_eta_2() { return sdl.t5_eta_2(); } - const std::vector &pLS_eta() { return sdl.pLS_eta(); } - const std::vector &sim_pdgId() { return sdl.sim_pdgId(); } - const std::vector &t3_eta() { return sdl.t3_eta(); } - const std::vector &tce_layer_binary() { return sdl.tce_layer_binary(); } - const std::vector &sim_TC_matched_nonextended() { return sdl.sim_TC_matched_nonextended(); } - const std::vector &t4_occupancies() { return sdl.t4_occupancies(); } - const std::vector &tce_eta() { return sdl.tce_eta(); } - const std::vector &tce_isDuplicate() { return sdl.tce_isDuplicate(); } - const std::vector > &pT5_matched_simIdx() { return sdl.pT5_matched_simIdx(); } - const std::vector > &sim_tcIdx() { return sdl.sim_tcIdx(); } - const std::vector &t5_phi_2() { return sdl.t5_phi_2(); } - const std::vector &pureTCE_maxHitMatchedCounts() { return sdl.pureTCE_maxHitMatchedCounts(); } - const std::vector > &t5_matched_simIdx() { return sdl.t5_matched_simIdx(); } - const std::vector &module_subdets() { return sdl.module_subdets(); } - const std::vector &tce_anchorType() { return sdl.tce_anchorType(); } - const std::vector > &tce_nHitOverlaps() { return sdl.tce_nHitOverlaps(); } - const std::vector &t3_isFake() { return sdl.t3_isFake(); } - const std::vector &tce_phi() { return sdl.tce_phi(); } - const std::vector &t5_isFake() { return sdl.t5_isFake(); } - const std::vector &md_occupancies() { return sdl.md_occupancies(); } - const std::vector > &t5_hitIdxs() { return sdl.t5_hitIdxs(); } - const std::vector > &sim_pT3_types() { return sdl.sim_pT3_types(); } - const std::vector > &sim_pureTCE_types() { return sdl.sim_pureTCE_types(); } - const std::vector &t4_phi() { return sdl.t4_phi(); } - const std::vector &t5_phi() { return sdl.t5_phi(); } - const std::vector > &pT5_hitIdxs() { return sdl.pT5_hitIdxs(); } - const std::vector &t5_pt() { return sdl.t5_pt(); } - const std::vector &pT5_phi() { return sdl.pT5_phi(); } - const std::vector &pureTCE_isFake() { return sdl.pureTCE_isFake(); } - const std::vector &tce_pt() { return sdl.tce_pt(); } - const std::vector &tc_isFake() { return sdl.tc_isFake(); } - const std::vector &pT3_isFake() { return sdl.pT3_isFake(); } - const std::vector > &tce_nLayerOverlaps() { return sdl.tce_nLayerOverlaps(); } - const std::vector &tc_sim() { return sdl.tc_sim(); } - const std::vector > &sim_pLS_types() { return sdl.sim_pLS_types(); } - const std::vector &sim_pca_dxy() { return sdl.sim_pca_dxy(); } - const std::vector &pT4_phi() { return sdl.pT4_phi(); } - const std::vector &sim_hits() { return sdl.sim_hits(); } - const std::vector &pLS_phi() { return sdl.pLS_phi(); } - const std::vector &sim_pureTCE_matched() { return sdl.sim_pureTCE_matched(); } - const std::vector &t3_occupancies() { return sdl.t3_occupancies(); } - const std::vector &t5_foundDuplicate() { return sdl.t5_foundDuplicate(); } - const std::vector > &sim_pT4_types() { return sdl.sim_pT4_types(); } - const std::vector &t4_isFake() { return sdl.t4_isFake(); } - const std::vector &simvtx_x() { return sdl.simvtx_x(); } - const std::vector &simvtx_y() { return sdl.simvtx_y(); } - const std::vector &simvtx_z() { return sdl.simvtx_z(); } - const std::vector &sim_T4_matched() { return sdl.sim_T4_matched(); } - const std::vector &sim_isGood() { return sdl.sim_isGood(); } - const std::vector &pT3_pt() { return sdl.pT3_pt(); } - const std::vector &tc_pt() { return sdl.tc_pt(); } - const std::vector &pT3_phi_2() { return sdl.pT3_phi_2(); } - const std::vector &pT5_pt() { return sdl.pT5_pt(); } - const std::vector &pureTCE_rPhiChiSquared() { return sdl.pureTCE_rPhiChiSquared(); } - const std::vector &pT5_score() { return sdl.pT5_score(); } - const std::vector &sim_phi() { return sdl.sim_phi(); } - const std::vector &pT5_isFake() { return sdl.pT5_isFake(); } - const std::vector &tc_maxHitMatchedCounts() { return sdl.tc_maxHitMatchedCounts(); } - const std::vector > &pureTCE_nLayerOverlaps() { return sdl.pureTCE_nLayerOverlaps(); } - const std::vector &sim_pca_dz() { return sdl.sim_pca_dz(); } - const std::vector > &pureTCE_hitIdxs() { return sdl.pureTCE_hitIdxs(); } - const std::vector > &pureTCE_nHitOverlaps() { return sdl.pureTCE_nHitOverlaps(); } - const std::vector &sim_pLS_matched() { return sdl.sim_pLS_matched(); } - const std::vector > &tc_matched_simIdx() { return sdl.tc_matched_simIdx(); } - const std::vector &sim_T3_matched() { return sdl.sim_T3_matched(); } - const std::vector &pLS_score() { return sdl.pLS_score(); } - const std::vector &pT3_phi() { return sdl.pT3_phi(); } - const std::vector &pT5_eta() { return sdl.pT5_eta(); } - const std::vector &tc_phi() { return sdl.tc_phi(); } - const std::vector &t4_eta() { return sdl.t4_eta(); } - const std::vector &pLS_isFake() { return sdl.pLS_isFake(); } - const std::vector > &pureTCE_matched_simIdx() { return sdl.pureTCE_matched_simIdx(); } - const std::vector &sim_bunchCrossing() { return sdl.sim_bunchCrossing(); } - const std::vector &tc_partOfExtension() { return sdl.tc_partOfExtension(); } - const std::vector &pT3_eta() { return sdl.pT3_eta(); } - const std::vector &sim_parentVtxIdx() { return sdl.sim_parentVtxIdx(); } - const std::vector &pureTCE_layer_binary() { return sdl.pureTCE_layer_binary(); } - const std::vector &sim_pT4_matched() { return sdl.sim_pT4_matched(); } - const std::vector &tc_eta() { return sdl.tc_eta(); } - const std::vector &sim_lengap() { return sdl.sim_lengap(); } - const std::vector &sim_T5_matched() { return sdl.sim_T5_matched(); } - const std::vector > &sim_T5_types() { return sdl.sim_T5_types(); } - const std::vector > &tce_matched_simIdx() { return sdl.tce_matched_simIdx(); } - const std::vector &t5_isDuplicate() { return sdl.t5_isDuplicate(); } - const std::vector > &pT3_hitIdxs() { return sdl.pT3_hitIdxs(); } - const std::vector > &tc_hitIdxs() { return sdl.tc_hitIdxs(); } - const int &pT3_occupancies() { return sdl.pT3_occupancies(); } - const int &tc_occupancies() { return sdl.tc_occupancies(); } - const std::vector &sim_TC_matched() { return sdl.sim_TC_matched(); } - const std::vector &sim_TC_matched_mask() { return sdl.sim_TC_matched_mask(); } - const std::vector &pLS_isDuplicate() { return sdl.pLS_isDuplicate(); } - const std::vector &tce_anchorIndex() { return sdl.tce_anchorIndex(); } - const std::vector &t5_occupancies() { return sdl.t5_occupancies(); } - const std::vector &tc_type() { return sdl.tc_type(); } - const std::vector &tce_isFake() { return sdl.tce_isFake(); } - const std::vector &pLS_pt() { return sdl.pLS_pt(); } - const std::vector &pureTCE_anchorIndex() { return sdl.pureTCE_anchorIndex(); } - const std::vector > &sim_T4_types() { return sdl.sim_T4_types(); } - const std::vector &pT4_isDuplicate() { return sdl.pT4_isDuplicate(); } - const std::vector &t4_pt() { return sdl.t4_pt(); } - const std::vector > &sim_TC_types() { return sdl.sim_TC_types(); } - const std::vector &sg_occupancies() { return sdl.sg_occupancies(); } - const std::vector &pT4_pt() { return sdl.pT4_pt(); } - const std::vector &pureTCE_phi() { return sdl.pureTCE_phi(); } - const std::vector &sim_vx() { return sdl.sim_vx(); } - const std::vector &sim_vy() { return sdl.sim_vy(); } - const std::vector &sim_vz() { return sdl.sim_vz(); } - const std::vector &tce_maxHitMatchedCounts() { return sdl.tce_maxHitMatchedCounts(); } - const std::vector &t3_pt() { return sdl.t3_pt(); } - const std::vector &module_rings() { return sdl.module_rings(); } - const std::vector > &sim_T3_types() { return sdl.sim_T3_types(); } - const std::vector > &sim_pT5_types() { return sdl.sim_pT5_types(); } - const std::vector &sim_pT5_matched() { return sdl.sim_pT5_matched(); } - const std::vector &module_layers() { return sdl.module_layers(); } - const std::vector &pT4_eta() { return sdl.pT4_eta(); } - const std::vector > &sim_tce_types() { return sdl.sim_tce_types(); } - const std::vector &tce_rzChiSquared() { return sdl.tce_rzChiSquared(); } - const std::vector > &pT3_matched_simIdx() { return sdl.pT3_matched_simIdx(); } + const int &pT5_occupancies() { return lstEff.pT5_occupancies(); } + const std::vector &t3_phi() { return lstEff.t3_phi(); } + const std::vector &t5_score_rphisum() { return lstEff.t5_score_rphisum(); } + const std::vector &pT4_isFake() { return lstEff.pT4_isFake(); } + const std::vector &t3_isDuplicate() { return lstEff.t3_isDuplicate(); } + const std::vector &sim_event() { return lstEff.sim_event(); } + const std::vector &sim_q() { return lstEff.sim_q(); } + const std::vector &sim_eta() { return lstEff.sim_eta(); } + const std::vector &pT3_foundDuplicate() { return lstEff.pT3_foundDuplicate(); } + const std::vector &sim_len() { return lstEff.sim_len(); } + const std::vector &pureTCE_isDuplicate() { return lstEff.pureTCE_isDuplicate(); } + const std::vector &pT3_score() { return lstEff.pT3_score(); } + const std::vector &t5_eta() { return lstEff.t5_eta(); } + const std::vector &sim_denom() { return lstEff.sim_denom(); } + const std::vector &pT5_isDuplicate() { return lstEff.pT5_isDuplicate(); } + const std::vector &sim_tce_matched() { return lstEff.sim_tce_matched(); } + const std::vector &pT3_isDuplicate() { return lstEff.pT3_isDuplicate(); } + const std::vector &tc_isDuplicate() { return lstEff.tc_isDuplicate(); } + const std::vector &pT3_eta_2() { return lstEff.pT3_eta_2(); } + const std::vector &sim_pT3_matched() { return lstEff.sim_pT3_matched(); } + const std::vector &pureTCE_rzChiSquared() { return lstEff.pureTCE_rzChiSquared(); } + const std::vector &t4_isDuplicate() { return lstEff.t4_isDuplicate(); } + const std::vector &pureTCE_eta() { return lstEff.pureTCE_eta(); } + const std::vector &tce_rPhiChiSquared() { return lstEff.tce_rPhiChiSquared(); } + const std::vector &pureTCE_anchorType() { return lstEff.pureTCE_anchorType(); } + const std::vector &pureTCE_pt() { return lstEff.pureTCE_pt(); } + const std::vector &sim_pt() { return lstEff.sim_pt(); } + const std::vector &t5_eta_2() { return lstEff.t5_eta_2(); } + const std::vector &pLS_eta() { return lstEff.pLS_eta(); } + const std::vector &sim_pdgId() { return lstEff.sim_pdgId(); } + const std::vector &t3_eta() { return lstEff.t3_eta(); } + const std::vector &tce_layer_binary() { return lstEff.tce_layer_binary(); } + const std::vector &sim_TC_matched_nonextended() { return lstEff.sim_TC_matched_nonextended(); } + const std::vector &t4_occupancies() { return lstEff.t4_occupancies(); } + const std::vector &tce_eta() { return lstEff.tce_eta(); } + const std::vector &tce_isDuplicate() { return lstEff.tce_isDuplicate(); } + const std::vector > &pT5_matched_simIdx() { return lstEff.pT5_matched_simIdx(); } + const std::vector > &sim_tcIdx() { return lstEff.sim_tcIdx(); } + const std::vector &t5_phi_2() { return lstEff.t5_phi_2(); } + const std::vector &pureTCE_maxHitMatchedCounts() { return lstEff.pureTCE_maxHitMatchedCounts(); } + const std::vector > &t5_matched_simIdx() { return lstEff.t5_matched_simIdx(); } + const std::vector &module_subdets() { return lstEff.module_subdets(); } + const std::vector &tce_anchorType() { return lstEff.tce_anchorType(); } + const std::vector > &tce_nHitOverlaps() { return lstEff.tce_nHitOverlaps(); } + const std::vector &t3_isFake() { return lstEff.t3_isFake(); } + const std::vector &tce_phi() { return lstEff.tce_phi(); } + const std::vector &t5_isFake() { return lstEff.t5_isFake(); } + const std::vector &md_occupancies() { return lstEff.md_occupancies(); } + const std::vector > &t5_hitIdxs() { return lstEff.t5_hitIdxs(); } + const std::vector > &sim_pT3_types() { return lstEff.sim_pT3_types(); } + const std::vector > &sim_pureTCE_types() { return lstEff.sim_pureTCE_types(); } + const std::vector &t4_phi() { return lstEff.t4_phi(); } + const std::vector &t5_phi() { return lstEff.t5_phi(); } + const std::vector > &pT5_hitIdxs() { return lstEff.pT5_hitIdxs(); } + const std::vector &t5_pt() { return lstEff.t5_pt(); } + const std::vector &pT5_phi() { return lstEff.pT5_phi(); } + const std::vector &pureTCE_isFake() { return lstEff.pureTCE_isFake(); } + const std::vector &tce_pt() { return lstEff.tce_pt(); } + const std::vector &tc_isFake() { return lstEff.tc_isFake(); } + const std::vector &pT3_isFake() { return lstEff.pT3_isFake(); } + const std::vector > &tce_nLayerOverlaps() { return lstEff.tce_nLayerOverlaps(); } + const std::vector &tc_sim() { return lstEff.tc_sim(); } + const std::vector > &sim_pLS_types() { return lstEff.sim_pLS_types(); } + const std::vector &sim_pca_dxy() { return lstEff.sim_pca_dxy(); } + const std::vector &pT4_phi() { return lstEff.pT4_phi(); } + const std::vector &sim_hits() { return lstEff.sim_hits(); } + const std::vector &pLS_phi() { return lstEff.pLS_phi(); } + const std::vector &sim_pureTCE_matched() { return lstEff.sim_pureTCE_matched(); } + const std::vector &t3_occupancies() { return lstEff.t3_occupancies(); } + const std::vector &t5_foundDuplicate() { return lstEff.t5_foundDuplicate(); } + const std::vector > &sim_pT4_types() { return lstEff.sim_pT4_types(); } + const std::vector &t4_isFake() { return lstEff.t4_isFake(); } + const std::vector &simvtx_x() { return lstEff.simvtx_x(); } + const std::vector &simvtx_y() { return lstEff.simvtx_y(); } + const std::vector &simvtx_z() { return lstEff.simvtx_z(); } + const std::vector &sim_T4_matched() { return lstEff.sim_T4_matched(); } + const std::vector &sim_isGood() { return lstEff.sim_isGood(); } + const std::vector &pT3_pt() { return lstEff.pT3_pt(); } + const std::vector &tc_pt() { return lstEff.tc_pt(); } + const std::vector &pT3_phi_2() { return lstEff.pT3_phi_2(); } + const std::vector &pT5_pt() { return lstEff.pT5_pt(); } + const std::vector &pureTCE_rPhiChiSquared() { return lstEff.pureTCE_rPhiChiSquared(); } + const std::vector &pT5_score() { return lstEff.pT5_score(); } + const std::vector &sim_phi() { return lstEff.sim_phi(); } + const std::vector &pT5_isFake() { return lstEff.pT5_isFake(); } + const std::vector &tc_maxHitMatchedCounts() { return lstEff.tc_maxHitMatchedCounts(); } + const std::vector > &pureTCE_nLayerOverlaps() { return lstEff.pureTCE_nLayerOverlaps(); } + const std::vector &sim_pca_dz() { return lstEff.sim_pca_dz(); } + const std::vector > &pureTCE_hitIdxs() { return lstEff.pureTCE_hitIdxs(); } + const std::vector > &pureTCE_nHitOverlaps() { return lstEff.pureTCE_nHitOverlaps(); } + const std::vector &sim_pLS_matched() { return lstEff.sim_pLS_matched(); } + const std::vector > &tc_matched_simIdx() { return lstEff.tc_matched_simIdx(); } + const std::vector &sim_T3_matched() { return lstEff.sim_T3_matched(); } + const std::vector &pLS_score() { return lstEff.pLS_score(); } + const std::vector &pT3_phi() { return lstEff.pT3_phi(); } + const std::vector &pT5_eta() { return lstEff.pT5_eta(); } + const std::vector &tc_phi() { return lstEff.tc_phi(); } + const std::vector &t4_eta() { return lstEff.t4_eta(); } + const std::vector &pLS_isFake() { return lstEff.pLS_isFake(); } + const std::vector > &pureTCE_matched_simIdx() { return lstEff.pureTCE_matched_simIdx(); } + const std::vector &sim_bunchCrossing() { return lstEff.sim_bunchCrossing(); } + const std::vector &tc_partOfExtension() { return lstEff.tc_partOfExtension(); } + const std::vector &pT3_eta() { return lstEff.pT3_eta(); } + const std::vector &sim_parentVtxIdx() { return lstEff.sim_parentVtxIdx(); } + const std::vector &pureTCE_layer_binary() { return lstEff.pureTCE_layer_binary(); } + const std::vector &sim_pT4_matched() { return lstEff.sim_pT4_matched(); } + const std::vector &tc_eta() { return lstEff.tc_eta(); } + const std::vector &sim_lengap() { return lstEff.sim_lengap(); } + const std::vector &sim_T5_matched() { return lstEff.sim_T5_matched(); } + const std::vector > &sim_T5_types() { return lstEff.sim_T5_types(); } + const std::vector > &tce_matched_simIdx() { return lstEff.tce_matched_simIdx(); } + const std::vector &t5_isDuplicate() { return lstEff.t5_isDuplicate(); } + const std::vector > &pT3_hitIdxs() { return lstEff.pT3_hitIdxs(); } + const std::vector > &tc_hitIdxs() { return lstEff.tc_hitIdxs(); } + const int &pT3_occupancies() { return lstEff.pT3_occupancies(); } + const int &tc_occupancies() { return lstEff.tc_occupancies(); } + const std::vector &sim_TC_matched() { return lstEff.sim_TC_matched(); } + const std::vector &sim_TC_matched_mask() { return lstEff.sim_TC_matched_mask(); } + const std::vector &pLS_isDuplicate() { return lstEff.pLS_isDuplicate(); } + const std::vector &tce_anchorIndex() { return lstEff.tce_anchorIndex(); } + const std::vector &t5_occupancies() { return lstEff.t5_occupancies(); } + const std::vector &tc_type() { return lstEff.tc_type(); } + const std::vector &tce_isFake() { return lstEff.tce_isFake(); } + const std::vector &pLS_pt() { return lstEff.pLS_pt(); } + const std::vector &pureTCE_anchorIndex() { return lstEff.pureTCE_anchorIndex(); } + const std::vector > &sim_T4_types() { return lstEff.sim_T4_types(); } + const std::vector &pT4_isDuplicate() { return lstEff.pT4_isDuplicate(); } + const std::vector &t4_pt() { return lstEff.t4_pt(); } + const std::vector > &sim_TC_types() { return lstEff.sim_TC_types(); } + const std::vector &sg_occupancies() { return lstEff.sg_occupancies(); } + const std::vector &pT4_pt() { return lstEff.pT4_pt(); } + const std::vector &pureTCE_phi() { return lstEff.pureTCE_phi(); } + const std::vector &sim_vx() { return lstEff.sim_vx(); } + const std::vector &sim_vy() { return lstEff.sim_vy(); } + const std::vector &sim_vz() { return lstEff.sim_vz(); } + const std::vector &tce_maxHitMatchedCounts() { return lstEff.tce_maxHitMatchedCounts(); } + const std::vector &t3_pt() { return lstEff.t3_pt(); } + const std::vector &module_rings() { return lstEff.module_rings(); } + const std::vector > &sim_T3_types() { return lstEff.sim_T3_types(); } + const std::vector > &sim_pT5_types() { return lstEff.sim_pT5_types(); } + const std::vector &sim_pT5_matched() { return lstEff.sim_pT5_matched(); } + const std::vector &module_layers() { return lstEff.module_layers(); } + const std::vector &pT4_eta() { return lstEff.pT4_eta(); } + const std::vector > &sim_tce_types() { return lstEff.sim_tce_types(); } + const std::vector &tce_rzChiSquared() { return lstEff.tce_rzChiSquared(); } + const std::vector > &pT3_matched_simIdx() { return lstEff.pT3_matched_simIdx(); } } // namespace tas diff --git a/RecoTracker/LSTCore/standalone/efficiency/src/SDL.h b/RecoTracker/LSTCore/standalone/efficiency/src/LSTEff.h similarity index 99% rename from RecoTracker/LSTCore/standalone/efficiency/src/SDL.h rename to RecoTracker/LSTCore/standalone/efficiency/src/LSTEff.h index 312200e00443a..9c53fb92c7f62 100644 --- a/RecoTracker/LSTCore/standalone/efficiency/src/SDL.h +++ b/RecoTracker/LSTCore/standalone/efficiency/src/LSTEff.h @@ -1,6 +1,6 @@ // -*- C++ -*- -#ifndef SDL_H -#define SDL_H +#ifndef LSTEff_H +#define LSTEff_H #include "Math/LorentzVector.h" #include "Math/Point3D.h" #include "TMath.h" @@ -13,7 +13,7 @@ #include typedef ROOT::Math::LorentzVector > LorentzVector; -class SDL { +class LSTEff { private: protected: unsigned int index; @@ -610,7 +610,7 @@ class SDL { }; #ifndef __CINT__ -extern SDL sdl; +extern LSTEff lstEff; #endif namespace tas { diff --git a/RecoTracker/LSTCore/standalone/efficiency/src/helper.cc b/RecoTracker/LSTCore/standalone/efficiency/src/helper.cc index ffba160a66155..79c34b8b8cad4 100644 --- a/RecoTracker/LSTCore/standalone/efficiency/src/helper.cc +++ b/RecoTracker/LSTCore/standalone/efficiency/src/helper.cc @@ -196,7 +196,7 @@ void initializeInputsAndOutputs() { ana.events_tchain = RooUtil::FileUtil::createTChain(ana.input_tree_name, ana.input_file_list_tstring); // This is a standard thing SNT does pretty much every looper we use - ana.looper.init(ana.events_tchain, &sdl, ana.n_events); + ana.looper.init(ana.events_tchain, &lstEff, ana.n_events); // Set the cutflow object output file ana.cutflow.setTFile(ana.output_tfile); diff --git a/RecoTracker/LSTCore/standalone/efficiency/src/helper.h b/RecoTracker/LSTCore/standalone/efficiency/src/helper.h index 11df4779e06cc..6b263d9553920 100644 --- a/RecoTracker/LSTCore/standalone/efficiency/src/helper.h +++ b/RecoTracker/LSTCore/standalone/efficiency/src/helper.h @@ -1,7 +1,7 @@ #ifndef helper_h #define helper_h -#include "SDL.h" +#include "LSTEff.h" #include "cxxopts.h" #include "rooutil.h" @@ -39,7 +39,7 @@ class AnalysisConfig { TChain* events_tchain; // Custom Looper object to facilitate looping over many files - RooUtil::Looper looper; + RooUtil::Looper looper; // Custom Cutflow framework RooUtil::Cutflow cutflow; diff --git a/RecoTracker/LSTCore/standalone/efficiency/src/performance.cc b/RecoTracker/LSTCore/standalone/efficiency/src/performance.cc index 5eefc4b6d4276..b6c9c1f420066 100644 --- a/RecoTracker/LSTCore/standalone/efficiency/src/performance.cc +++ b/RecoTracker/LSTCore/standalone/efficiency/src/performance.cc @@ -25,11 +25,11 @@ int main(int argc, char** argv) { }; std::vector> sels = { [&](unsigned int isim) { return 1.; }, - [&](unsigned int isim) { return abs(sdl.sim_eta().at(isim)) < 2.4; }, - [&](unsigned int isim) { return abs(sdl.sim_eta().at(isim)) > 1.1 and abs(sdl.sim_eta().at(isim)) < 1.7; }, + [&](unsigned int isim) { return abs(lstEff.sim_eta().at(isim)) < 2.4; }, + [&](unsigned int isim) { return abs(lstEff.sim_eta().at(isim)) > 1.1 and abs(lstEff.sim_eta().at(isim)) < 1.7; }, [&](unsigned int isim) { - return (abs(sdl.sim_eta().at(isim)) < 1.1 or abs(sdl.sim_eta().at(isim)) > 1.7) and - abs(sdl.sim_eta().at(isim)) < 2.4; + return (abs(lstEff.sim_eta().at(isim)) < 1.1 or abs(lstEff.sim_eta().at(isim)) > 1.7) and + abs(lstEff.sim_eta().at(isim)) < 2.4; }}; pdgids.insert(pdgids.end(), ana.pdgids.begin(), ana.pdgids.end()); @@ -43,53 +43,53 @@ int main(int argc, char** argv) { SimTrackSetDefinition(/* name */ TString("TC_") + selnames[isel], /* pdgid */ pdgid, /* q */ charge, - /* pass */ [&](unsigned int isim) { return sdl.sim_TC_matched().at(isim) > 0; }, + /* pass */ [&](unsigned int isim) { return lstEff.sim_TC_matched().at(isim) > 0; }, /* sel */ sels[isel])); list_effSetDef.push_back(SimTrackSetDefinition( /* name */ TString("pT5_") + selnames[isel], /* pdgid */ pdgid, /* q */ charge, - /* pass */ [&](unsigned int isim) { return sdl.sim_TC_matched_mask().at(isim) & (1 << pT5); }, + /* pass */ [&](unsigned int isim) { return lstEff.sim_TC_matched_mask().at(isim) & (1 << pT5); }, /* sel */ sels[isel])); list_effSetDef.push_back(SimTrackSetDefinition( /* name */ TString("pT3_") + selnames[isel], /* pdgid */ pdgid, /* q */ charge, - /* pass */ [&](unsigned int isim) { return sdl.sim_TC_matched_mask().at(isim) & (1 << pT3); }, + /* pass */ [&](unsigned int isim) { return lstEff.sim_TC_matched_mask().at(isim) & (1 << pT3); }, /* sel */ sels[isel])); list_effSetDef.push_back(SimTrackSetDefinition( /* name */ TString("T5_") + selnames[isel], /* pdgid */ pdgid, /* q */ charge, - /* pass */ [&](unsigned int isim) { return sdl.sim_TC_matched_mask().at(isim) & (1 << T5); }, + /* pass */ [&](unsigned int isim) { return lstEff.sim_TC_matched_mask().at(isim) & (1 << T5); }, /* sel */ sels[isel])); list_effSetDef.push_back(SimTrackSetDefinition( /* name */ TString("pLS_") + selnames[isel], /* pdgid */ pdgid, /* q */ charge, - /* pass */ [&](unsigned int isim) { return sdl.sim_TC_matched_mask().at(isim) & (1 << pLS); }, + /* pass */ [&](unsigned int isim) { return lstEff.sim_TC_matched_mask().at(isim) & (1 << pLS); }, /* sel */ sels[isel])); if (ana.do_lower_level) { //lower objects - name will have pT5_lower_, T5_lower_, pT3_lower_ - list_effSetDef.push_back( - SimTrackSetDefinition(/* name */ TString("pT5_lower_") + selnames[isel], - /* pdgid */ pdgid, - /* q */ charge, - /* pass */ [&](unsigned int isim) { return sdl.sim_pT5_matched().at(isim) > 0; }, - /* sel */ sels[isel])); + list_effSetDef.push_back(SimTrackSetDefinition( + /* name */ TString("pT5_lower_") + selnames[isel], + /* pdgid */ pdgid, + /* q */ charge, + /* pass */ [&](unsigned int isim) { return lstEff.sim_pT5_matched().at(isim) > 0; }, + /* sel */ sels[isel])); list_effSetDef.push_back( SimTrackSetDefinition(/* name */ TString("T5_lower_") + selnames[isel], /* pdgid */ pdgid, /* q */ charge, - /* pass */ [&](unsigned int isim) { return sdl.sim_T5_matched().at(isim) > 0; }, - /* sel */ sels[isel])); - list_effSetDef.push_back( - SimTrackSetDefinition(/* name */ TString("pT3_lower_") + selnames[isel], - /* pdgid */ pdgid, - /* q */ charge, - /* pass */ [&](unsigned int isim) { return sdl.sim_pT3_matched().at(isim) > 0; }, + /* pass */ [&](unsigned int isim) { return lstEff.sim_T5_matched().at(isim) > 0; }, /* sel */ sels[isel])); + list_effSetDef.push_back(SimTrackSetDefinition( + /* name */ TString("pT3_lower_") + selnames[isel], + /* pdgid */ pdgid, + /* q */ charge, + /* pass */ [&](unsigned int isim) { return lstEff.sim_pT3_matched().at(isim) > 0; }, + /* sel */ sels[isel])); } } } @@ -101,7 +101,7 @@ int main(int argc, char** argv) { std::vector list_FRSetDef; list_FRSetDef.push_back( RecoTrackSetDefinition(/* name */ "TC", - /* pass */ [&](unsigned int itc) { return sdl.tc_isFake().at(itc) > 0; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isFake().at(itc) > 0; }, /* sel */ [&](unsigned int itc) { return 1; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, @@ -109,32 +109,32 @@ int main(int argc, char** argv) { /* type */ tas::tc_type)); list_FRSetDef.push_back( RecoTrackSetDefinition(/* name */ "pT5", - /* pass */ [&](unsigned int itc) { return sdl.tc_isFake().at(itc) > 0; }, - /* sel */ [&](unsigned int itc) { return sdl.tc_type().at(itc) == pT5; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isFake().at(itc) > 0; }, + /* sel */ [&](unsigned int itc) { return lstEff.tc_type().at(itc) == pT5; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, /* phi */ tas::tc_phi, /* type */ tas::tc_type)); list_FRSetDef.push_back( RecoTrackSetDefinition(/* name */ "pT3", - /* pass */ [&](unsigned int itc) { return sdl.tc_isFake().at(itc) > 0; }, - /* sel */ [&](unsigned int itc) { return sdl.tc_type().at(itc) == pT3; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isFake().at(itc) > 0; }, + /* sel */ [&](unsigned int itc) { return lstEff.tc_type().at(itc) == pT3; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, /* phi */ tas::tc_phi, /* type */ tas::tc_type)); list_FRSetDef.push_back( RecoTrackSetDefinition(/* name */ "T5", - /* pass */ [&](unsigned int itc) { return sdl.tc_isFake().at(itc) > 0; }, - /* sel */ [&](unsigned int itc) { return sdl.tc_type().at(itc) == T5; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isFake().at(itc) > 0; }, + /* sel */ [&](unsigned int itc) { return lstEff.tc_type().at(itc) == T5; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, /* phi */ tas::tc_phi, /* type */ tas::tc_type)); list_FRSetDef.push_back( RecoTrackSetDefinition(/* name */ "pLS", - /* pass */ [&](unsigned int itc) { return sdl.tc_isFake().at(itc) > 0; }, - /* sel */ [&](unsigned int itc) { return sdl.tc_type().at(itc) == pLS; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isFake().at(itc) > 0; }, + /* sel */ [&](unsigned int itc) { return lstEff.tc_type().at(itc) == pLS; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, /* phi */ tas::tc_phi, @@ -143,7 +143,7 @@ int main(int argc, char** argv) { if (ana.do_lower_level) { list_FRSetDef.push_back(RecoTrackSetDefinition( /* name */ "pT5_lower", - /* pass */ [&](unsigned int ipT5) { return sdl.pT5_isFake().at(ipT5) > 0; }, + /* pass */ [&](unsigned int ipT5) { return lstEff.pT5_isFake().at(ipT5) > 0; }, /* sel */ [&](unsigned int ipT5) { return 1; }, /* pt */ tas::pT5_pt, /* eta */ tas::pT5_eta, @@ -151,7 +151,7 @@ int main(int argc, char** argv) { /* type */ [&]() { return static_cast>(std::vector(tas::pT5_pt().size(), 1)); })); list_FRSetDef.push_back(RecoTrackSetDefinition( /* name */ "T5_lower", - /* pass */ [&](unsigned int it5) { return sdl.t5_isFake().at(it5) > 0; }, + /* pass */ [&](unsigned int it5) { return lstEff.t5_isFake().at(it5) > 0; }, /* sel */ [&](unsigned int it5) { return 1; }, /* pt */ tas::t5_pt, /* eta */ tas::t5_eta, @@ -159,7 +159,7 @@ int main(int argc, char** argv) { /* type */ [&]() { return static_cast>(std::vector(tas::t5_pt().size(), 1)); })); list_FRSetDef.push_back(RecoTrackSetDefinition( /* name */ "pT3_lower", - /* pass */ [&](unsigned int ipT3) { return sdl.pT3_isFake().at(ipT3) > 0; }, + /* pass */ [&](unsigned int ipT3) { return lstEff.pT3_isFake().at(ipT3) > 0; }, /* sel */ [&](unsigned int ipT3) { return 1; }, /* pt */ tas::pT3_pt, /* eta */ tas::pT3_eta, @@ -173,7 +173,7 @@ int main(int argc, char** argv) { std::vector list_DRSetDef; list_DRSetDef.push_back( RecoTrackSetDefinition(/* name */ "TC", - /* pass */ [&](unsigned int itc) { return sdl.tc_isDuplicate().at(itc) > 0; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isDuplicate().at(itc) > 0; }, /* sel */ [&](unsigned int itc) { return 1; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, @@ -181,32 +181,32 @@ int main(int argc, char** argv) { /* type */ tas::tc_type)); list_DRSetDef.push_back( RecoTrackSetDefinition(/* name */ "pT5", - /* pass */ [&](unsigned int itc) { return sdl.tc_isDuplicate().at(itc) > 0; }, - /* sel */ [&](unsigned int itc) { return sdl.tc_type().at(itc) == pT5; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isDuplicate().at(itc) > 0; }, + /* sel */ [&](unsigned int itc) { return lstEff.tc_type().at(itc) == pT5; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, /* phi */ tas::tc_phi, /* type */ tas::tc_type)); list_DRSetDef.push_back( RecoTrackSetDefinition(/* name */ "pT3", - /* pass */ [&](unsigned int itc) { return sdl.tc_isDuplicate().at(itc) > 0; }, - /* sel */ [&](unsigned int itc) { return sdl.tc_type().at(itc) == pT3; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isDuplicate().at(itc) > 0; }, + /* sel */ [&](unsigned int itc) { return lstEff.tc_type().at(itc) == pT3; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, /* phi */ tas::tc_phi, /* type */ tas::tc_type)); list_DRSetDef.push_back( RecoTrackSetDefinition(/* name */ "T5", - /* pass */ [&](unsigned int itc) { return sdl.tc_isDuplicate().at(itc) > 0; }, - /* sel */ [&](unsigned int itc) { return sdl.tc_type().at(itc) == T5; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isDuplicate().at(itc) > 0; }, + /* sel */ [&](unsigned int itc) { return lstEff.tc_type().at(itc) == T5; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, /* phi */ tas::tc_phi, /* type */ tas::tc_type)); list_DRSetDef.push_back( RecoTrackSetDefinition(/* name */ "pLS", - /* pass */ [&](unsigned int itc) { return sdl.tc_isDuplicate().at(itc) > 0; }, - /* sel */ [&](unsigned int itc) { return sdl.tc_type().at(itc) == pLS; }, + /* pass */ [&](unsigned int itc) { return lstEff.tc_isDuplicate().at(itc) > 0; }, + /* sel */ [&](unsigned int itc) { return lstEff.tc_type().at(itc) == pLS; }, /* pt */ tas::tc_pt, /* eta */ tas::tc_eta, /* phi */ tas::tc_phi, @@ -215,7 +215,7 @@ int main(int argc, char** argv) { if (ana.do_lower_level) { list_DRSetDef.push_back(RecoTrackSetDefinition( /* name */ "pT5_lower", - /* pass */ [&](unsigned int ipT5) { return sdl.pT5_isDuplicate().at(ipT5) > 0; }, + /* pass */ [&](unsigned int ipT5) { return lstEff.pT5_isDuplicate().at(ipT5) > 0; }, /* sel */ [&](unsigned int ipT5) { return 1; }, /* pt */ tas::pT5_pt, /* eta */ tas::pT5_eta, @@ -223,7 +223,7 @@ int main(int argc, char** argv) { /* type */ [&]() { return static_cast>(std::vector(tas::pT5_pt().size(), 1)); })); list_DRSetDef.push_back(RecoTrackSetDefinition( /* name */ "T5_lower", - /* pass */ [&](unsigned int it5) { return sdl.t5_isDuplicate().at(it5) > 0; }, + /* pass */ [&](unsigned int it5) { return lstEff.t5_isDuplicate().at(it5) > 0; }, /* sel */ [&](unsigned int it5) { return 1; }, /* pt */ tas::t5_pt, /* eta */ tas::t5_eta, @@ -231,7 +231,7 @@ int main(int argc, char** argv) { /* type */ [&]() { return static_cast>(std::vector(tas::t5_pt().size(), 1)); })); list_DRSetDef.push_back(RecoTrackSetDefinition( /* name */ "pT3_lower", - /* pass */ [&](unsigned int ipT3) { return sdl.pT3_isDuplicate().at(ipT3) > 0; }, + /* pass */ [&](unsigned int ipT3) { return lstEff.pT3_isDuplicate().at(ipT3) > 0; }, /* sel */ [&](unsigned int ipT3) { return 1; }, /* pt */ tas::pT3_pt, /* eta */ tas::pT3_eta, @@ -527,7 +527,7 @@ void bookFakeRateSet(RecoTrackSetDefinition& FRset) { //__________________________________________________________________________________________________________________________________________________________________________ void fillEfficiencySets(std::vector& effsets) { for (auto& effset : effsets) { - for (unsigned int isimtrk = 0; isimtrk < sdl.sim_pt().size(); ++isimtrk) { + for (unsigned int isimtrk = 0; isimtrk < lstEff.sim_pt().size(); ++isimtrk) { fillEfficiencySet(isimtrk, effset); } } @@ -537,24 +537,24 @@ void fillEfficiencySets(std::vector& effsets) { void fillEfficiencySet(int isimtrk, SimTrackSetDefinition& effset) { //========================================================= // NOTE: The following is not applied as the LSTNtuple no longer writes this. - // const int &bunch = sdl.sim_bunchCrossing()[isimtrk]; - // const int &event = sdl.sim_event()[isimtrk]; + // const int &bunch = lstEff.sim_bunchCrossing()[isimtrk]; + // const int &event = lstEff.sim_event()[isimtrk]; // if (bunch != 0) // return; // if (event != 0) // return; //========================================================= - const float& pt = sdl.sim_pt()[isimtrk]; - const float& eta = sdl.sim_eta()[isimtrk]; - const float& dz = sdl.sim_pca_dz()[isimtrk]; - const float& dxy = sdl.sim_pca_dxy()[isimtrk]; - const float& phi = sdl.sim_phi()[isimtrk]; - const int& pdgidtrk = sdl.sim_pdgId()[isimtrk]; - const int& q = sdl.sim_q()[isimtrk]; - const float& vtx_x = sdl.sim_vx()[isimtrk]; - const float& vtx_y = sdl.sim_vy()[isimtrk]; - const float& vtx_z = sdl.sim_vz()[isimtrk]; + const float& pt = lstEff.sim_pt()[isimtrk]; + const float& eta = lstEff.sim_eta()[isimtrk]; + const float& dz = lstEff.sim_pca_dz()[isimtrk]; + const float& dxy = lstEff.sim_pca_dxy()[isimtrk]; + const float& phi = lstEff.sim_phi()[isimtrk]; + const int& pdgidtrk = lstEff.sim_pdgId()[isimtrk]; + const int& q = lstEff.sim_q()[isimtrk]; + const float& vtx_x = lstEff.sim_vx()[isimtrk]; + const float& vtx_y = lstEff.sim_vy()[isimtrk]; + const float& vtx_z = lstEff.sim_vz()[isimtrk]; const float& vtx_perp = sqrt(vtx_x * vtx_x + vtx_y * vtx_y); bool pass = effset.pass(isimtrk); bool sel = effset.sel(isimtrk); diff --git a/RecoTracker/LSTCore/standalone/efficiency/src/performance.h b/RecoTracker/LSTCore/standalone/efficiency/src/performance.h index f6a4607508a5c..229bb3c87765e 100644 --- a/RecoTracker/LSTCore/standalone/efficiency/src/performance.h +++ b/RecoTracker/LSTCore/standalone/efficiency/src/performance.h @@ -1,7 +1,7 @@ #ifndef process_h #define process_h -#include "SDL.h" +#include "LSTEff.h" #include "rooutil.h" #include "cxxopts.h" #include "helper.h" diff --git a/RecoTracker/LSTCore/standalone/setup.sh b/RecoTracker/LSTCore/standalone/setup.sh index f83ca036f060d..4337ffeaddf6d 100644 --- a/RecoTracker/LSTCore/standalone/setup.sh +++ b/RecoTracker/LSTCore/standalone/setup.sh @@ -32,7 +32,7 @@ echo "Setup following ROOT. Make sure the appropriate setup file has been run. O which root DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -export LD_LIBRARY_PATH=$DIR/SDL:$DIR:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$DIR/LST:$DIR:$LD_LIBRARY_PATH export PATH=$DIR/bin:$PATH export PATH=$DIR/efficiency/bin:$PATH export PATH=$DIR/efficiency/python:$PATH diff --git a/RecoTracker/LSTCore/standalone/setup_hpg.sh b/RecoTracker/LSTCore/standalone/setup_hpg.sh deleted file mode 100644 index 04ab93ab57b3c..0000000000000 --- a/RecoTracker/LSTCore/standalone/setup_hpg.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# HiPerGator module setup for cuda -module load cuda/11.4.3 git -# module use ~/module -# module load root/6.22.08 - -########################################################################################################### -# Setup environments -########################################################################################################### -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source $DIR/code/rooutil/thisrooutil.sh - -export SCRAM_ARCH=el8_amd64_gcc12 -export CMSSW_VERSION=CMSSW_14_1_0_pre5 -export CUDA_HOME=${HPC_CUDA_DIR} - -source /cvmfs/cms.cern.ch/cmsset_default.sh -cd /cvmfs/cms.cern.ch/$SCRAM_ARCH/cms/cmssw/$CMSSW_VERSION/src -eval `scramv1 runtime -sh` - -# Export paths to libraries we need -export BOOST_ROOT=$(scram tool info boost | grep BOOST_BASE | cut -d'=' -f2) -export ALPAKA_ROOT=$(scram tool info alpaka | grep ALPAKA_BASE | cut -d'=' -f2) -export ROOT_ROOT=$(scram tool info root_interface | grep ROOT_INTERFACE_BASE | cut -d'=' -f2) -export ROCM_ROOT=$(scram tool info rocm | grep ROCM_BASE | cut -d'=' -f2) - -cd - > /dev/null -echo "Setup following ROOT. Make sure the appropriate setup file has been run. Otherwise the looper won't compile." -which root - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -export LD_LIBRARY_PATH=$DIR/SDL/cuda:$DIR/SDL/cpu:$DIR:$LD_LIBRARY_PATH -export PATH=$DIR/bin:$PATH -export PATH=$DIR/efficiency/bin:$PATH -export PATH=$DIR/efficiency/python:$PATH -export TRACKLOOPERDIR=$DIR -export TRACKINGNTUPLEDIR=/blue/p.chang/p.chang/data/lst/CMSSW_12_2_0_pre2 -export LSTOUTPUTDIR=. -export LSTPERFORMANCEWEBDIR=/home/users/phchang/public_html/LSTPerformanceWeb - -########################################################################################################### -# Validation scripts -########################################################################################################### - -# List of benchmark efficiencies are set as an environment variable -export LATEST_CPU_BENCHMARK_EFF_MUONGUN= -export LATEST_CPU_BENCHMARK_EFF_PU200= -#eof