Review fixes

cms-sw · Oct 28, 2024 · 48d01f3 · 48d01f3
1 parent d08032a
commit 48d01f3
Show file tree

Hide file tree

Showing 20 changed files with 208 additions and 249 deletions.
diff --git a/RecoTracker/LSTCore/interface/HitsHostCollection.h b/RecoTracker/LSTCore/interface/HitsHostCollection.h
@@ -5,6 +5,6 @@
 #include "DataFormats/Portable/interface/PortableHostCollection.h"
 
 namespace lst {
-  using HitsHostCollection = PortableHostMultiCollection<HitsSoA, HitsOccupancySoA>;
+  using HitsHostCollection = PortableHostMultiCollection<HitsSoA, HitsRangesSoA>;
 }  // namespace lst
 #endif
diff --git a/RecoTracker/LSTCore/interface/HitsSoA.h b/RecoTracker/LSTCore/interface/HitsSoA.h
@@ -23,20 +23,20 @@ namespace lst {
                       SOA_COLUMN(float, lowEdgeXs),
                       SOA_COLUMN(float, lowEdgeYs))
 
-  GENERATE_SOA_LAYOUT(HitsOccupancySoALayout,
+  GENERATE_SOA_LAYOUT(HitsRangesSoALayout,
                       SOA_COLUMN(ArrayIx2, hitRanges),
                       SOA_COLUMN(int, hitRangesLower),
                       SOA_COLUMN(int, hitRangesUpper),
                       SOA_COLUMN(int8_t, hitRangesnLower),
                       SOA_COLUMN(int8_t, hitRangesnUpper))
 
   using HitsSoA = HitsSoALayout<>;
-  using HitsOccupancySoA = HitsOccupancySoALayout<>;
+  using HitsRangesSoA = HitsRangesSoALayout<>;
 
   using Hits = HitsSoA::View;
   using HitsConst = HitsSoA::ConstView;
-  using HitsOccupancy = HitsOccupancySoA::View;
-  using HitsOccupancyConst = HitsOccupancySoA::ConstView;
+  using HitsRanges = HitsRangesSoA::View;
+  using HitsRangesConst = HitsRangesSoA::ConstView;
 
 }  // namespace lst
 

diff --git a/RecoTracker/LSTCore/interface/ModulesSoA.h b/RecoTracker/LSTCore/interface/ModulesSoA.h
@@ -24,8 +24,6 @@ namespace lst {
                       SOA_COLUMN(uint16_t, nConnectedModules),
                       SOA_COLUMN(float, drdzs),
                       SOA_COLUMN(float, dxdys),
-                      SOA_SCALAR(uint16_t, nModules),
-                      SOA_SCALAR(uint16_t, nLowerModules),
                       SOA_COLUMN(uint16_t, partnerModuleIndices),
                       SOA_COLUMN(short, layers),
                       SOA_COLUMN(short, rings),
@@ -40,7 +38,9 @@ namespace lst {
                       SOA_COLUMN(bool, isAnchor),
                       SOA_COLUMN(ModuleType, moduleType),
                       SOA_COLUMN(ModuleLayerType, moduleLayerType),
-                      SOA_COLUMN(int, lstLayers))
+                      SOA_COLUMN(int, lstLayers),
+                      SOA_SCALAR(uint16_t, nModules),
+                      SOA_SCALAR(uint16_t, nLowerModules))
 
   GENERATE_SOA_LAYOUT(ModulesPixelSoALayout, SOA_COLUMN(unsigned int, connectedPixels))
 

diff --git a/RecoTracker/LSTCore/interface/ObjectRangesHostCollection.h b/RecoTracker/LSTCore/interface/ObjectRangesHostCollection.h
@@ -5,6 +5,6 @@
 #include "DataFormats/Portable/interface/PortableHostCollection.h"
 
 namespace lst {
-  using ObjectRangesHostCollection = PortableHostMultiCollection<ObjectRangesSoA, ObjectOccupancySoA>;
+  using ObjectRangesHostCollection = PortableHostCollection<ObjectRangesSoA>;
 }  // namespace lst
 #endif
diff --git a/RecoTracker/LSTCore/interface/ObjectRangesSoA.h b/RecoTracker/LSTCore/interface/ObjectRangesSoA.h
@@ -9,19 +9,10 @@
 namespace lst {
 
   GENERATE_SOA_LAYOUT(ObjectRangesSoALayout,
-                      SOA_COLUMN(ArrayIx2, hitRanges),
-                      SOA_COLUMN(int, hitRangesLower),
-                      SOA_COLUMN(int, hitRangesUpper),
-                      SOA_COLUMN(int8_t, hitRangesnLower),
-                      SOA_COLUMN(int8_t, hitRangesnUpper),
                       SOA_COLUMN(ArrayIx2, mdRanges),
                       SOA_COLUMN(ArrayIx2, segmentRanges),
-                      SOA_COLUMN(ArrayIx2, trackletRanges),
                       SOA_COLUMN(ArrayIx2, tripletRanges),
-                      SOA_COLUMN(ArrayIx2, quintupletRanges))
-
-  // triplets and quintuplets end up with an ununsed pixel entry at the end
-  GENERATE_SOA_LAYOUT(ObjectOccupancySoALayout,
+                      SOA_COLUMN(ArrayIx2, quintupletRanges),
                       SOA_COLUMN(int, miniDoubletModuleIndices),
                       SOA_COLUMN(int, miniDoubletModuleOccupancy),
                       SOA_COLUMN(int, segmentModuleIndices),
@@ -38,12 +29,9 @@ namespace lst {
                       SOA_SCALAR(uint16_t, nEligibleT5Modules))
 
   using ObjectRangesSoA = ObjectRangesSoALayout<>;
-  using ObjectOccupancySoA = ObjectOccupancySoALayout<>;
 
   using ObjectRanges = ObjectRangesSoA::View;
   using ObjectRangesConst = ObjectRangesSoA::ConstView;
-  using ObjectOccupancy = ObjectOccupancySoA::View;
-  using ObjectOccupancyConst = ObjectOccupancySoA::ConstView;
 
 }  // namespace lst
 

diff --git a/RecoTracker/LSTCore/interface/alpaka/HitsDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/HitsDeviceCollection.h
@@ -6,7 +6,7 @@
 #include "RecoTracker/LSTCore/interface/HitsSoA.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
-  using HitsDeviceCollection = PortableCollection2<HitsSoA, HitsOccupancySoA>;
+  using HitsDeviceCollection = PortableCollection2<HitsSoA, HitsRangesSoA>;
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst
 
 #endif
diff --git a/RecoTracker/LSTCore/interface/alpaka/ObjectRangesDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/ObjectRangesDeviceCollection.h
@@ -6,7 +6,7 @@
 #include "RecoTracker/LSTCore/interface/ObjectRangesSoA.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
-  using ObjectRangesDeviceCollection = PortableCollection2<ObjectRangesSoA, ObjectOccupancySoA>;
+  using ObjectRangesDeviceCollection = PortableCollection<ObjectRangesSoA>;
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst
 
 #endif