Moved MiniDoubletsDeviceCollection definition

trackreco · Oct 14, 2024 · 36a8c43 · 36a8c43
1 parent 3b4fa9e
commit 36a8c43
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h b/RecoTracker/LSTCore/interface/MiniDoubletsSoA.h
@@ -2,9 +2,9 @@
 #define RecoTracker_LSTCore_interface_MiniDoubletsSoA_h
 
 #include "DataFormats/SoATemplate/interface/SoALayout.h"
-#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
+#include "DataFormats/Portable/interface/PortableCollection.h"
 
-namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
+namespace lst {
 
   GENERATE_SOA_LAYOUT(MiniDoubletsSoALayout,
                       SOA_COLUMN(unsigned int, anchorHitIndices),
@@ -53,9 +53,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
   using MiniDoubletsOccupancy = MiniDoubletsOccupancySoA::View;
   using MiniDoubletsOccupancyConst = MiniDoubletsOccupancySoA::ConstView;
 
-  using MiniDoubletsDeviceCollection = PortableCollection2<MiniDoubletsSoA, MiniDoubletsOccupancySoA>;
   using MiniDoubletsHostCollection = PortableHostMultiCollection<MiniDoubletsSoA, MiniDoubletsOccupancySoA>;
 
-}  // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst
+}  // namespace lst
 
-#endif
+#endif
diff --git a/RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h b/RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h
@@ -0,0 +1,12 @@
+#ifndef RecoTracker_LSTCore_interface_alpaka_MiniDoubletsSoA_h
+#define RecoTracker_LSTCore_interface_alpaka_MiniDoubletsSoA_h
+
+#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
+
+#include "RecoTracker/LSTCore/interface/MiniDoubletsSoA.h"
+
+namespace ALPAKA_ACCELERATOR_NAMESPACE::lst {
+    using MiniDoubletsDeviceCollection = PortableCollection2<MiniDoubletsSoA, MiniDoubletsOccupancySoA>;
+} // namespace ALPAKA_ACCELERATOR_NAMESPACE::lst
+
+#endif
diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h
@@ -5,6 +5,7 @@
 
 #include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
 #include "RecoTracker/LSTCore/interface/MiniDoubletsSoA.h"
+#include "RecoTracker/LSTCore/interface/alpaka/MiniDoubletsDeviceCollection.h"
 #include "RecoTracker/LSTCore/interface/Module.h"
 #include "RecoTracker/LSTCore/interface/EndcapGeometry.h"