Merge pull request #49206 from slava77/CMSSW_16_0_0_pre1/lst013-innermod

LST: define Module isGloballyInner flag and use it to define the reference shift in the minidoublets

Author: cmsbuild

RecoTracker/LSTCore/interface/ModulesSoA.h

@@ -33,8 +33,10 @@ namespace lst {
                       SOA_COLUMN(short, sides),
                       SOA_COLUMN(float, eta),
                       SOA_COLUMN(float, r),
+                      SOA_COLUMN(float, z),
                       SOA_COLUMN(bool, isInverted),
                       SOA_COLUMN(bool, isLower),
+                      SOA_COLUMN(bool, isGloballyInner),
                       SOA_COLUMN(bool, isAnchor),
                       SOA_COLUMN(ModuleType, moduleType),
                       SOA_COLUMN(ModuleLayerType, moduleLayerType),

RecoTracker/LSTCore/src/ModuleMethods.h

@@ -255,8 +255,10 @@ namespace lst {
     std::span<short> host_sides = modules_view.sides();
     std::span<float> host_eta = modules_view.eta();
     std::span<float> host_r = modules_view.r();
+    std::span<float> host_z = modules_view.z();
     std::span<bool> host_isInverted = modules_view.isInverted();
     std::span<bool> host_isLower = modules_view.isLower();
+    std::span<bool> host_isGloballyInner = modules_view.isGloballyInner();
     std::span<bool> host_isAnchor = modules_view.isAnchor();
     std::span<ModuleType> host_moduleType = modules_view.moduleType();
     std::span<ModuleLayerType> host_moduleLayerType = modules_view.moduleLayerType();
@@ -320,10 +322,12 @@ namespace lst {
       host_sides[index] = side;
       host_eta[index] = eta;
       host_r[index] = r;
+      host_z[index] = m_z;
       host_isInverted[index] = isInverted;
       host_isLower[index] = isLower;
 
       //assigning other variables!
+      host_isGloballyInner[index] = false;
       if (detId == 1) {
         host_moduleType[index] = PixelModule;
         host_moduleLayerType[index] = lst::InnerPixelLayer;
@@ -356,12 +360,22 @@ namespace lst {
       if (detId != 1) {
         host_partnerModuleIndices[index] =
             mmd.detIdToIndex[parsePartnerModuleId(detId, host_isLower[index], host_isInverted[index])];
+        auto const partnerIdx = host_partnerModuleIndices[index];
         //add drdz and slope importing stuff here!
         if (host_drdzs[index] == 0) {
-          host_drdzs[index] = host_drdzs[host_partnerModuleIndices[index]];
+          host_drdzs[index] = host_drdzs[partnerIdx];
         }
         if (host_dxdys[index] == 0) {
-          host_dxdys[index] = host_dxdys[host_partnerModuleIndices[index]];
+          host_dxdys[index] = host_dxdys[partnerIdx];
+        }
+        if (host_isLower[index]) {
+          if (host_subdets[index] == Barrel) {
+            // 3D r should be reliable to order all modules
+            host_isGloballyInner[index] = host_r[index] < host_r[partnerIdx];
+          } else {
+            host_isGloballyInner[index] = std::abs(host_z[index]) < std::abs(host_z[partnerIdx]);
+          }
+          host_isGloballyInner[partnerIdx] = !host_isGloballyInner[index];
         }
       }
     }

RecoTracker/LSTCore/src/alpaka/MiniDoublet.h

@@ -51,7 +51,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
     }
 
     mds.dphichanges()[idx] = dPhiChange;
-
     mds.dphis()[idx] = dPhi;
     mds.dzs()[idx] = dz;
     mds.shiftedXs()[idx] = shiftedX;
@@ -250,10 +249,10 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
     float absdzprime;  // The distance between the two points after shifting
     const float& drdz_ = modules.drdzs()[lowerModuleIndex];
     // Assign hit pointers based on their hit type
+    bool pHitInverted = false;
     if (modules.moduleType()[lowerModuleIndex] == PS) {
       // TODO: This is somewhat of an mystery.... somewhat confused why this is the case
-      if (modules.subdets()[lowerModuleIndex] == Barrel ? modules.moduleLayerType()[lowerModuleIndex] != Pixel
-                                                        : modules.moduleLayerType()[lowerModuleIndex] == Pixel) {
+      if (modules.moduleLayerType()[lowerModuleIndex] == Pixel) {
         xo = xUpper;
         yo = yUpper;
         xp = xLower;
@@ -267,6 +266,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
         yp = yUpper;
         zp = zUpper;
         rtp = rtUpper;
+        pHitInverted = true;
       }
     } else {
       xo = xUpper;
@@ -293,7 +293,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
     moduleSeparation = moduleGapSize(modules, lowerModuleIndex);
 
     // Sign flips if the pixel is later layer
-    if (modules.moduleType()[lowerModuleIndex] == PS and modules.moduleLayerType()[lowerModuleIndex] != Pixel) {
+    if (modules.isGloballyInner()[lowerModuleIndex] == pHitInverted) {
       moduleSeparation *= -1;
     }
 
@@ -456,7 +456,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
     // Ref to original code: https://github.com/slava77/cms-tkph2-ntuple/blob/184d2325147e6930030d3d1f780136bc2dd29ce6/doubletAnalysis.C#L3076
     if (modules.sides()[lowerModuleIndex] != Center) {
       // When it is tilted, use the new shifted positions
-      if (modules.moduleLayerType()[lowerModuleIndex] != Pixel) {
+      if (modules.moduleLayerType()[lowerModuleIndex] == Pixel) {
         // dPhi Change should be calculated so that the upper hit has higher rt.
         // In principle, this kind of check rt_lower < rt_upper should not be necessary because the hit shifting should have taken care of this.
         // (i.e. the strip hit is shifted to be aligned in the line of sight from interaction point to pixel hit of PS module guaranteeing rt ordering)