diff --git a/SDL/Constants.h b/SDL/Constants.h
index 75ff589a..25fd4314 100644
--- a/SDL/Constants.h
+++ b/SDL/Constants.h
@@ -119,13 +119,6 @@ namespace SDL {
 
   const unsigned int size_superbins = 45000;
 
-  // Temporary fix for endcap buffer allocation.
-  const unsigned int endcap_size = 9104;
-
-  // Temporary fix for module buffer allocation.
-  const unsigned int modules_size = 26401;
-  const unsigned int pix_tot = 1795336;
-
   //defining the constant host device variables right up here
   ALPAKA_STATIC_ACC_MEM_GLOBAL const float miniMulsPtScaleBarrel[6] = {0.0052, 0.0038, 0.0034, 0.0034, 0.0032, 0.0034};
   ALPAKA_STATIC_ACC_MEM_GLOBAL const float miniMulsPtScaleEndcap[5] = {0.006, 0.006, 0.006, 0.006, 0.006};
diff --git a/SDL/EndcapGeometry.cc b/SDL/EndcapGeometry.cc
index 6a150e46..2b5be62e 100644
--- a/SDL/EndcapGeometry.cc
+++ b/SDL/EndcapGeometry.cc
@@ -1,19 +1,16 @@
 #include "EndcapGeometry.h"
 
-SDL::EndcapGeometry<SDL::Dev>::EndcapGeometry(SDL::Dev const& devAccIn, unsigned int sizef)
-    : geoMapDetId_buf(allocBufWrapper<unsigned int>(devAccIn, sizef)),
-      geoMapPhi_buf(allocBufWrapper<float>(devAccIn, sizef)) {}
-
 SDL::EndcapGeometry<SDL::Dev>::EndcapGeometry(SDL::Dev const& devAccIn,
                                               SDL::QueueAcc& queue,
-                                              std::string filename,
-                                              unsigned int sizef)
-    : geoMapDetId_buf(allocBufWrapper<unsigned int>(devAccIn, sizef)),
-      geoMapPhi_buf(allocBufWrapper<float>(devAccIn, sizef)) {
-  load(queue, filename);
+                                              SDL::EndcapGeometryHost<SDL::Dev> const& endcapGeometryIn)
+    : geoMapDetId_buf(allocBufWrapper<unsigned int>(devAccIn, endcapGeometryIn.centroid_phis_.size())),
+      geoMapPhi_buf(allocBufWrapper<float>(devAccIn, endcapGeometryIn.centroid_phis_.size())) {
+  dxdy_slope_ = endcapGeometryIn.dxdy_slope_;
+  centroid_phis_ = endcapGeometryIn.centroid_phis_;
+  fillGeoMapArraysExplicit(queue);
 }
 
-void SDL::EndcapGeometry<SDL::Dev>::load(SDL::QueueAcc& queue, std::string filename) {
+void SDL::EndcapGeometryHost<SDL::Dev>::load(std::string filename) {
   dxdy_slope_.clear();
   centroid_phis_.clear();
 
@@ -41,21 +38,11 @@ void SDL::EndcapGeometry<SDL::Dev>::load(SDL::QueueAcc& queue, std::string filen
       }
     }
   }
-
-  fillGeoMapArraysExplicit(queue);
 }
 
 void SDL::EndcapGeometry<SDL::Dev>::fillGeoMapArraysExplicit(SDL::QueueAcc& queue) {
   unsigned int phi_size = centroid_phis_.size();
 
-  // Temporary check for endcap initialization.
-  if (phi_size != endcap_size) {
-    std::cerr << "\nError: phi_size and endcap_size are not equal.\n";
-    std::cerr << "phi_size: " << phi_size << ", endcap_size: " << endcap_size << "\n";
-    std::cerr << "Please change endcap_size in Constants.h to make it equal to phi_size.\n";
-    throw std::runtime_error("Mismatched sizes");
-  }
-
   // Allocate buffers on host
   SDL::DevHost const& devHost = cms::alpakatools::host();
   auto mapPhi_host_buf = allocBufWrapper<float>(devHost, phi_size);
@@ -82,4 +69,17 @@ void SDL::EndcapGeometry<SDL::Dev>::fillGeoMapArraysExplicit(SDL::QueueAcc& queu
   alpaka::wait(queue);
 }
 
-float SDL::EndcapGeometry<SDL::Dev>::getdxdy_slope(unsigned int detid) { return dxdy_slope_[detid]; }
+float SDL::EndcapGeometry<SDL::Dev>::getdxdy_slope(unsigned int detid) const {
+  if (dxdy_slope_.find(detid) != dxdy_slope_.end()) {
+    return dxdy_slope_.at(detid);
+  } else {
+    return 0;
+  }
+}
+float SDL::EndcapGeometryHost<SDL::Dev>::getdxdy_slope(unsigned int detid) const {
+  if (dxdy_slope_.find(detid) != dxdy_slope_.end()) {
+    return dxdy_slope_.at(detid);
+  } else {
+    return 0;
+  }
+}
diff --git a/SDL/EndcapGeometry.h b/SDL/EndcapGeometry.h
index 61ae01fc..93da945c 100644
--- a/SDL/EndcapGeometry.h
+++ b/SDL/EndcapGeometry.h
@@ -18,10 +18,30 @@
 #include "HeterogeneousCore/AlpakaInterface/interface/host.h"
 
 namespace SDL {
+
+  // FIXME: Need to separate this better into host and device classes
+  // This is only needed for host, but we template it to avoid symbol conflicts
   template <typename TDev>
-  class EndcapGeometry {};
+  class EndcapGeometryHost;
+
   template <>
-  class EndcapGeometry<SDL::Dev> {
+  class EndcapGeometryHost<Dev> {
+  public:
+    std::map<unsigned int, float> dxdy_slope_;     // dx/dy slope
+    std::map<unsigned int, float> centroid_phis_;  // centroid phi
+
+    EndcapGeometryHost() = default;
+    ~EndcapGeometryHost() = default;
+
+    void load(std::string);
+    float getdxdy_slope(unsigned int detid) const;
+  };
+
+  template <typename TDev>
+  class EndcapGeometry;
+
+  template <>
+  class EndcapGeometry<Dev> {
   private:
     std::map<unsigned int, float> dxdy_slope_;     // dx/dy slope
     std::map<unsigned int, float> centroid_phis_;  // centroid phi
@@ -32,14 +52,11 @@ namespace SDL {
 
     unsigned int nEndCapMap;
 
-    EndcapGeometry(Dev const& devAccIn, unsigned int sizef = endcap_size);
-    EndcapGeometry(Dev const& devAccIn, QueueAcc& queue, std::string filename, unsigned int sizef = endcap_size);
+    EndcapGeometry(Dev const& devAccIn, QueueAcc& queue, SDL::EndcapGeometryHost<Dev> const& endcapGeometryIn);
     ~EndcapGeometry() = default;
 
-    void load(QueueAcc& queue, std::string);
-
     void fillGeoMapArraysExplicit(QueueAcc& queue);
-    float getdxdy_slope(unsigned int detid);
+    float getdxdy_slope(unsigned int detid) const;
   };
 }  // namespace SDL
 
diff --git a/SDL/Event.cc b/SDL/Event.cc
index 54aea9b3..2eb98b58 100644
--- a/SDL/Event.cc
+++ b/SDL/Event.cc
@@ -1,5 +1,4 @@
 #include "Event.h"
-#include "Globals.h"
 
 void SDL::Event<SDL::Acc>::init(bool verbose) {
   addObjects = verbose;
@@ -149,22 +148,6 @@ void SDL::Event<SDL::Acc>::resetEvent() {
   }
 }
 
-void SDL::Event<SDL::Acc>::initModules(QueueAcc& queue,
-                                       const MapPLStoLayer& pLStoLayer,
-                                       const char* moduleMetaDataFilePath) {
-  // nModules gets filled here
-  loadModulesFromFile(Globals<SDL::Dev>::modulesBuffers,
-                      Globals<SDL::Dev>::nModules,
-                      Globals<SDL::Dev>::nLowerModules,
-                      *Globals<SDL::Dev>::pixelMapping,
-                      queue,
-                      moduleMetaDataFilePath,
-                      pLStoLayer);
-
-  // hand over to the const access ("ES")
-  Globals<SDL::Dev>::modulesBuffersES = Globals<SDL::Dev>::modulesBuffers;
-}
-
 void SDL::Event<SDL::Acc>::addHitToEvent(std::vector<float> x,
                                          std::vector<float> y,
                                          std::vector<float> z,
@@ -176,14 +159,13 @@ void SDL::Event<SDL::Acc>::addHitToEvent(std::vector<float> x,
   // Initialize space on device/host for next event.
   if (hitsInGPU == nullptr) {
     hitsInGPU = new SDL::hits();
-    hitsBuffers = new SDL::hitsBuffer<Dev>(Globals<SDL::Dev>::nModules, nHits, devAcc, queue);
+    hitsBuffers = new SDL::hitsBuffer<Dev>(nModules_, nHits, devAcc, queue);
     hitsInGPU->setData(*hitsBuffers);
   }
 
   if (rangesInGPU == nullptr) {
     rangesInGPU = new SDL::objectRanges();
-    rangesBuffers =
-        new SDL::objectRangesBuffer<Dev>(Globals<SDL::Dev>::nModules, Globals<SDL::Dev>::nLowerModules, devAcc, queue);
+    rangesBuffers = new SDL::objectRangesBuffer<Dev>(nModules_, nLowerModules_, devAcc, queue);
     rangesInGPU->setData(*rangesBuffers);
   }
 
@@ -204,18 +186,17 @@ void SDL::Event<SDL::Acc>::addHitToEvent(std::vector<float> x,
   WorkDiv const hit_loop_workdiv = createWorkDiv(blocksPerGrid1, threadsPerBlock1, elementsPerThread);
 
   hitLoopKernel hit_loop_kernel;
-  auto const hit_loop_task(
-      alpaka::createTaskKernel<Acc>(hit_loop_workdiv,
-                                    hit_loop_kernel,
-                                    Endcap,
-                                    TwoS,
-                                    Globals<SDL::Dev>::nModules,
-                                    SDL::Globals<SDL::Dev>::endcapGeometry->nEndCapMap,
-                                    alpaka::getPtrNative(SDL::Globals<SDL::Dev>::endcapGeometry->geoMapDetId_buf),
-                                    alpaka::getPtrNative(SDL::Globals<SDL::Dev>::endcapGeometry->geoMapPhi_buf),
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
-                                    *hitsInGPU,
-                                    nHits));
+  auto const hit_loop_task(alpaka::createTaskKernel<Acc>(hit_loop_workdiv,
+                                                         hit_loop_kernel,
+                                                         Endcap,
+                                                         TwoS,
+                                                         nModules_,
+                                                         endcapGeometry_->nEndCapMap,
+                                                         alpaka::getPtrNative(endcapGeometry_->geoMapDetId_buf),
+                                                         alpaka::getPtrNative(endcapGeometry_->geoMapPhi_buf),
+                                                         *modulesBuffers_->data(),
+                                                         *hitsInGPU,
+                                                         nHits));
 
   alpaka::enqueue(queue, hit_loop_task);
 
@@ -224,11 +205,8 @@ void SDL::Event<SDL::Acc>::addHitToEvent(std::vector<float> x,
   WorkDiv const module_ranges_workdiv = createWorkDiv(blocksPerGrid2, threadsPerBlock2, elementsPerThread);
 
   moduleRangesKernel module_ranges_kernel;
-  auto const module_ranges_task(alpaka::createTaskKernel<Acc>(module_ranges_workdiv,
-                                                              module_ranges_kernel,
-                                                              *Globals<SDL::Dev>::modulesBuffersES->data(),
-                                                              *hitsInGPU,
-                                                              Globals<SDL::Dev>::nLowerModules));
+  auto const module_ranges_task(alpaka::createTaskKernel<Acc>(
+      module_ranges_workdiv, module_ranges_kernel, *modulesBuffers_->data(), *hitsInGPU, nLowerModules_));
 
   // Waiting isn't needed after second kernel call. Saves ~100 us.
   // This is because addPixelSegmentToEvent (which is run next) doesn't rely on hitsBuffers->hitrange variables.
@@ -266,12 +244,12 @@ void SDL::Event<SDL::Acc>::addPixelSegmentToEvent(std::vector<unsigned int> hitI
   }
 
   unsigned int mdSize = 2 * size;
-  uint16_t pixelModuleIndex = Globals<SDL::Dev>::pixelMapping->pixelModuleIndex;
+  uint16_t pixelModuleIndex = pixelMapping_->pixelModuleIndex;
 
   if (mdsInGPU == nullptr) {
-    // Create a view for the element nLowerModules inside rangesBuffers->miniDoubletModuleOccupancy
-    auto dst_view_miniDoubletModuleOccupancy = alpaka::createSubView(
-        rangesBuffers->miniDoubletModuleOccupancy_buf, (Idx)1u, (Idx)Globals<SDL::Dev>::nLowerModules);
+    // Create a view for the element nLowerModules_ inside rangesBuffers->miniDoubletModuleOccupancy
+    auto dst_view_miniDoubletModuleOccupancy =
+        alpaka::createSubView(rangesBuffers->miniDoubletModuleOccupancy_buf, (Idx)1u, (Idx)nLowerModules_);
 
     // Create a source view for the value to be set
     int value = N_MAX_PIXEL_MD_PER_MODULES;
@@ -286,10 +264,8 @@ void SDL::Event<SDL::Acc>::addPixelSegmentToEvent(std::vector<unsigned int> hitI
         createWorkDiv(blocksPerGridCreateMD, threadsPerBlockCreateMD, elementsPerThread);
 
     SDL::createMDArrayRangesGPU createMDArrayRangesGPU_kernel;
-    auto const createMDArrayRangesGPUTask(alpaka::createTaskKernel<Acc>(createMDArrayRangesGPU_workDiv,
-                                                                        createMDArrayRangesGPU_kernel,
-                                                                        *Globals<SDL::Dev>::modulesBuffersES->data(),
-                                                                        *rangesInGPU));
+    auto const createMDArrayRangesGPUTask(alpaka::createTaskKernel<Acc>(
+        createMDArrayRangesGPU_workDiv, createMDArrayRangesGPU_kernel, *modulesBuffers_->data(), *rangesInGPU));
 
     alpaka::enqueue(queue, createMDArrayRangesGPUTask);
     alpaka::wait(queue);
@@ -303,7 +279,7 @@ void SDL::Event<SDL::Acc>::addPixelSegmentToEvent(std::vector<unsigned int> hitI
     nTotalMDs += N_MAX_PIXEL_MD_PER_MODULES;
 
     mdsInGPU = new SDL::miniDoublets();
-    miniDoubletsBuffers = new SDL::miniDoubletsBuffer<Dev>(nTotalMDs, Globals<SDL::Dev>::nLowerModules, devAcc, queue);
+    miniDoubletsBuffers = new SDL::miniDoubletsBuffer<Dev>(nTotalMDs, nLowerModules_, devAcc, queue);
     mdsInGPU->setData(*miniDoubletsBuffers);
 
     alpaka::memcpy(queue, miniDoubletsBuffers->nMemoryLocations_buf, nTotalMDs_view);
@@ -321,7 +297,7 @@ void SDL::Event<SDL::Acc>::addPixelSegmentToEvent(std::vector<unsigned int> hitI
     SDL::createSegmentArrayRanges createSegmentArrayRanges_kernel;
     auto const createSegmentArrayRangesTask(alpaka::createTaskKernel<Acc>(createSegmentArrayRanges_workDiv,
                                                                           createSegmentArrayRanges_kernel,
-                                                                          *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                                          *modulesBuffers_->data(),
                                                                           *rangesInGPU,
                                                                           *mdsInGPU));
 
@@ -336,8 +312,8 @@ void SDL::Event<SDL::Acc>::addPixelSegmentToEvent(std::vector<unsigned int> hitI
     nTotalSegments += N_MAX_PIXEL_SEGMENTS_PER_MODULE;
 
     segmentsInGPU = new SDL::segments();
-    segmentsBuffers = new SDL::segmentsBuffer<Dev>(
-        nTotalSegments, Globals<SDL::Dev>::nLowerModules, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devAcc, queue);
+    segmentsBuffers =
+        new SDL::segmentsBuffer<Dev>(nTotalSegments, nLowerModules_, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devAcc, queue);
     segmentsInGPU->setData(*segmentsBuffers);
 
     alpaka::memcpy(queue, segmentsBuffers->nMemoryLocations_buf, nTotalSegments_view);
@@ -397,7 +373,7 @@ void SDL::Event<SDL::Acc>::addPixelSegmentToEvent(std::vector<unsigned int> hitI
   addPixelSegmentToEventKernel addPixelSegmentToEvent_kernel;
   auto const addPixelSegmentToEvent_task(alpaka::createTaskKernel<Acc>(addPixelSegmentToEvent_workdiv,
                                                                        addPixelSegmentToEvent_kernel,
-                                                                       *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                                       *modulesBuffers_->data(),
                                                                        *rangesInGPU,
                                                                        *hitsInGPU,
                                                                        *mdsInGPU,
@@ -415,9 +391,9 @@ void SDL::Event<SDL::Acc>::addPixelSegmentToEvent(std::vector<unsigned int> hitI
 }
 
 void SDL::Event<SDL::Acc>::createMiniDoublets() {
-  // Create a view for the element nLowerModules inside rangesBuffers->miniDoubletModuleOccupancy
-  auto dst_view_miniDoubletModuleOccupancy = alpaka::createSubView(
-      rangesBuffers->miniDoubletModuleOccupancy_buf, (Idx)1u, (Idx)Globals<SDL::Dev>::nLowerModules);
+  // Create a view for the element nLowerModules_ inside rangesBuffers->miniDoubletModuleOccupancy
+  auto dst_view_miniDoubletModuleOccupancy =
+      alpaka::createSubView(rangesBuffers->miniDoubletModuleOccupancy_buf, (Idx)1u, (Idx)nLowerModules_);
 
   // Create a source view for the value to be set
   int value = N_MAX_PIXEL_MD_PER_MODULES;
@@ -432,10 +408,8 @@ void SDL::Event<SDL::Acc>::createMiniDoublets() {
       createWorkDiv(blocksPerGridCreateMD, threadsPerBlockCreateMD, elementsPerThread);
 
   SDL::createMDArrayRangesGPU createMDArrayRangesGPU_kernel;
-  auto const createMDArrayRangesGPUTask(alpaka::createTaskKernel<Acc>(createMDArrayRangesGPU_workDiv,
-                                                                      createMDArrayRangesGPU_kernel,
-                                                                      *Globals<SDL::Dev>::modulesBuffersES->data(),
-                                                                      *rangesInGPU));
+  auto const createMDArrayRangesGPUTask(alpaka::createTaskKernel<Acc>(
+      createMDArrayRangesGPU_workDiv, createMDArrayRangesGPU_kernel, *modulesBuffers_->data(), *rangesInGPU));
 
   alpaka::enqueue(queue, createMDArrayRangesGPUTask);
   alpaka::wait(queue);
@@ -451,20 +425,19 @@ void SDL::Event<SDL::Acc>::createMiniDoublets() {
 
   if (mdsInGPU == nullptr) {
     mdsInGPU = new SDL::miniDoublets();
-    miniDoubletsBuffers = new SDL::miniDoubletsBuffer<Dev>(nTotalMDs, Globals<SDL::Dev>::nLowerModules, devAcc, queue);
+    miniDoubletsBuffers = new SDL::miniDoubletsBuffer<Dev>(nTotalMDs, nLowerModules_, devAcc, queue);
     mdsInGPU->setData(*miniDoubletsBuffers);
   }
 
   Vec const threadsPerBlockCreateMDInGPU = createVec(1, 16, 32);
-  Vec const blocksPerGridCreateMDInGPU =
-      createVec(1, Globals<SDL::Dev>::nLowerModules / threadsPerBlockCreateMDInGPU[1], 1);
+  Vec const blocksPerGridCreateMDInGPU = createVec(1, nLowerModules_ / threadsPerBlockCreateMDInGPU[1], 1);
   WorkDiv const createMiniDoubletsInGPUv2_workDiv =
       createWorkDiv(blocksPerGridCreateMDInGPU, threadsPerBlockCreateMDInGPU, elementsPerThread);
 
   SDL::createMiniDoubletsInGPUv2 createMiniDoubletsInGPUv2_kernel;
   auto const createMiniDoubletsInGPUv2Task(alpaka::createTaskKernel<Acc>(createMiniDoubletsInGPUv2_workDiv,
                                                                          createMiniDoubletsInGPUv2_kernel,
-                                                                         *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                                         *modulesBuffers_->data(),
                                                                          *hitsInGPU,
                                                                          *mdsInGPU,
                                                                          *rangesInGPU));
@@ -480,7 +453,7 @@ void SDL::Event<SDL::Acc>::createMiniDoublets() {
   auto const addMiniDoubletRangesToEventExplicitTask(
       alpaka::createTaskKernel<Acc>(addMiniDoubletRangesToEventExplicit_workDiv,
                                     addMiniDoubletRangesToEventExplicit_kernel,
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                    *modulesBuffers_->data(),
                                     *mdsInGPU,
                                     *rangesInGPU,
                                     *hitsInGPU));
@@ -496,20 +469,20 @@ void SDL::Event<SDL::Acc>::createMiniDoublets() {
 void SDL::Event<SDL::Acc>::createSegmentsWithModuleMap() {
   if (segmentsInGPU == nullptr) {
     segmentsInGPU = new SDL::segments();
-    segmentsBuffers = new SDL::segmentsBuffer<Dev>(
-        nTotalSegments, Globals<SDL::Dev>::nLowerModules, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devAcc, queue);
+    segmentsBuffers =
+        new SDL::segmentsBuffer<Dev>(nTotalSegments, nLowerModules_, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devAcc, queue);
     segmentsInGPU->setData(*segmentsBuffers);
   }
 
   Vec const threadsPerBlockCreateSeg = createVec(1, 1, 64);
-  Vec const blocksPerGridCreateSeg = createVec(1, 1, Globals<SDL::Dev>::nLowerModules);
+  Vec const blocksPerGridCreateSeg = createVec(1, 1, nLowerModules_);
   WorkDiv const createSegmentsInGPUv2_workDiv =
       createWorkDiv(blocksPerGridCreateSeg, threadsPerBlockCreateSeg, elementsPerThread);
 
   SDL::createSegmentsInGPUv2 createSegmentsInGPUv2_kernel;
   auto const createSegmentsInGPUv2Task(alpaka::createTaskKernel<Acc>(createSegmentsInGPUv2_workDiv,
                                                                      createSegmentsInGPUv2_kernel,
-                                                                     *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                                     *modulesBuffers_->data(),
                                                                      *mdsInGPU,
                                                                      *segmentsInGPU,
                                                                      *rangesInGPU));
@@ -522,12 +495,11 @@ void SDL::Event<SDL::Acc>::createSegmentsWithModuleMap() {
       createWorkDiv(blocksPerGridAddSeg, threadsPerBlockAddSeg, elementsPerThread);
 
   SDL::addSegmentRangesToEventExplicit addSegmentRangesToEventExplicit_kernel;
-  auto const addSegmentRangesToEventExplicitTask(
-      alpaka::createTaskKernel<Acc>(addSegmentRangesToEventExplicit_workDiv,
-                                    addSegmentRangesToEventExplicit_kernel,
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
-                                    *segmentsInGPU,
-                                    *rangesInGPU));
+  auto const addSegmentRangesToEventExplicitTask(alpaka::createTaskKernel<Acc>(addSegmentRangesToEventExplicit_workDiv,
+                                                                               addSegmentRangesToEventExplicit_kernel,
+                                                                               *modulesBuffers_->data(),
+                                                                               *segmentsInGPU,
+                                                                               *rangesInGPU));
 
   alpaka::enqueue(queue, addSegmentRangesToEventExplicitTask);
   alpaka::wait(queue);
@@ -547,7 +519,7 @@ void SDL::Event<SDL::Acc>::createTriplets() {
     SDL::createTripletArrayRanges createTripletArrayRanges_kernel;
     auto const createTripletArrayRangesTask(alpaka::createTaskKernel<Acc>(createTripletArrayRanges_workDiv,
                                                                           createTripletArrayRanges_kernel,
-                                                                          *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                                          *modulesBuffers_->data(),
                                                                           *rangesInGPU,
                                                                           *segmentsInGPU));
 
@@ -561,8 +533,8 @@ void SDL::Event<SDL::Acc>::createTriplets() {
     alpaka::wait(queue);
 
     tripletsInGPU = new SDL::triplets();
-    tripletsBuffers = new SDL::tripletsBuffer<Dev>(
-        *alpaka::getPtrNative(maxTriplets_buf), Globals<SDL::Dev>::nLowerModules, devAcc, queue);
+    tripletsBuffers =
+        new SDL::tripletsBuffer<Dev>(*alpaka::getPtrNative(maxTriplets_buf), nLowerModules_, devAcc, queue);
     tripletsInGPU->setData(*tripletsBuffers);
 
     alpaka::memcpy(queue, tripletsBuffers->nMemoryLocations_buf, maxTriplets_buf);
@@ -573,31 +545,27 @@ void SDL::Event<SDL::Acc>::createTriplets() {
   unsigned int max_InnerSeg = 0;
 
   // Allocate host index
-  auto index_buf = allocBufWrapper<uint16_t>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
+  auto index_buf = allocBufWrapper<uint16_t>(devHost, nLowerModules_, queue);
   uint16_t* index = alpaka::getPtrNative(index_buf);
 
   // Allocate device index
-  auto index_gpu_buf = allocBufWrapper<uint16_t>(devAcc, Globals<SDL::Dev>::nLowerModules, queue);
+  auto index_gpu_buf = allocBufWrapper<uint16_t>(devAcc, nLowerModules_, queue);
 
   // Allocate and copy nSegments from device to host
-  auto nSegments_buf = allocBufWrapper<unsigned int>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(queue, nSegments_buf, segmentsBuffers->nSegments_buf, Globals<SDL::Dev>::nLowerModules);
+  auto nSegments_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, nSegments_buf, segmentsBuffers->nSegments_buf, nLowerModules_);
   alpaka::wait(queue);
 
   unsigned int* nSegments = alpaka::getPtrNative(nSegments_buf);
 
   // Allocate and copy module_nConnectedModules from device to host
-  auto module_nConnectedModules_buf = allocBufWrapper<uint16_t>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(queue,
-                 module_nConnectedModules_buf,
-                 Globals<SDL::Dev>::modulesBuffersES->nConnectedModules_buf,
-                 Globals<SDL::Dev>::nLowerModules);
+  auto module_nConnectedModules_buf = allocBufWrapper<uint16_t>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, module_nConnectedModules_buf, modulesBuffers_->nConnectedModules_buf, nLowerModules_);
   alpaka::wait(queue);
 
   uint16_t* module_nConnectedModules = alpaka::getPtrNative(module_nConnectedModules_buf);
 
-  for (uint16_t innerLowerModuleIndex = 0; innerLowerModuleIndex < Globals<SDL::Dev>::nLowerModules;
-       innerLowerModuleIndex++) {
+  for (uint16_t innerLowerModuleIndex = 0; innerLowerModuleIndex < nLowerModules_; innerLowerModuleIndex++) {
     uint16_t nConnectedModules = module_nConnectedModules[innerLowerModuleIndex];
     unsigned int nInnerSegments = nSegments[innerLowerModuleIndex];
     if (nConnectedModules != 0 and nInnerSegments != 0) {
@@ -619,7 +587,7 @@ void SDL::Event<SDL::Acc>::createTriplets() {
   SDL::createTripletsInGPUv2 createTripletsInGPUv2_kernel;
   auto const createTripletsInGPUv2Task(alpaka::createTaskKernel<Acc>(createTripletsInGPUv2_workDiv,
                                                                      createTripletsInGPUv2_kernel,
-                                                                     *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                                     *modulesBuffers_->data(),
                                                                      *mdsInGPU,
                                                                      *segmentsInGPU,
                                                                      *tripletsInGPU,
@@ -635,12 +603,11 @@ void SDL::Event<SDL::Acc>::createTriplets() {
       createWorkDiv(blocksPerGridAddTrip, threadsPerBlockAddTrip, elementsPerThread);
 
   SDL::addTripletRangesToEventExplicit addTripletRangesToEventExplicit_kernel;
-  auto const addTripletRangesToEventExplicitTask(
-      alpaka::createTaskKernel<Acc>(addTripletRangesToEventExplicit_workDiv,
-                                    addTripletRangesToEventExplicit_kernel,
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
-                                    *tripletsInGPU,
-                                    *rangesInGPU));
+  auto const addTripletRangesToEventExplicitTask(alpaka::createTaskKernel<Acc>(addTripletRangesToEventExplicit_workDiv,
+                                                                               addTripletRangesToEventExplicit_kernel,
+                                                                               *modulesBuffers_->data(),
+                                                                               *tripletsInGPU,
+                                                                               *rangesInGPU));
 
   alpaka::enqueue(queue, addTripletRangesToEventExplicitTask);
   alpaka::wait(queue);
@@ -672,7 +639,7 @@ void SDL::Event<SDL::Acc>::createTrackCandidates() {
   SDL::crossCleanpT3 crossCleanpT3_kernel;
   auto const crossCleanpT3Task(alpaka::createTaskKernel<Acc>(crossCleanpT3_workDiv,
                                                              crossCleanpT3_kernel,
-                                                             *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                             *modulesBuffers_->data(),
                                                              *rangesInGPU,
                                                              *pixelTripletsInGPU,
                                                              *segmentsInGPU,
@@ -688,7 +655,7 @@ void SDL::Event<SDL::Acc>::createTrackCandidates() {
   SDL::addpT3asTrackCandidatesInGPU addpT3asTrackCandidatesInGPU_kernel;
   auto const addpT3asTrackCandidatesInGPUTask(alpaka::createTaskKernel<Acc>(addpT3asTrackCandidatesInGPU_workDiv,
                                                                             addpT3asTrackCandidatesInGPU_kernel,
-                                                                            Globals<SDL::Dev>::nLowerModules,
+                                                                            nLowerModules_,
                                                                             *pixelTripletsInGPU,
                                                                             *trackCandidatesInGPU,
                                                                             *segmentsInGPU,
@@ -719,7 +686,7 @@ void SDL::Event<SDL::Acc>::createTrackCandidates() {
   SDL::crossCleanT5 crossCleanT5_kernel;
   auto const crossCleanT5Task(alpaka::createTaskKernel<Acc>(crossCleanT5_workDiv,
                                                             crossCleanT5_kernel,
-                                                            *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                            *modulesBuffers_->data(),
                                                             *quintupletsInGPU,
                                                             *pixelQuintupletsInGPU,
                                                             *pixelTripletsInGPU,
@@ -735,7 +702,7 @@ void SDL::Event<SDL::Acc>::createTrackCandidates() {
   SDL::addT5asTrackCandidateInGPU addT5asTrackCandidateInGPU_kernel;
   auto const addT5asTrackCandidateInGPUTask(alpaka::createTaskKernel<Acc>(addT5asTrackCandidateInGPU_workDiv,
                                                                           addT5asTrackCandidateInGPU_kernel,
-                                                                          Globals<SDL::Dev>::nLowerModules,
+                                                                          nLowerModules_,
                                                                           *quintupletsInGPU,
                                                                           *trackCandidatesInGPU,
                                                                           *rangesInGPU));
@@ -750,7 +717,7 @@ void SDL::Event<SDL::Acc>::createTrackCandidates() {
 
   SDL::checkHitspLS checkHitspLS_kernel;
   auto const checkHitspLSTask(alpaka::createTaskKernel<Acc>(
-      checkHitspLS_workDiv, checkHitspLS_kernel, *Globals<SDL::Dev>::modulesBuffersES->data(), *segmentsInGPU, true));
+      checkHitspLS_workDiv, checkHitspLS_kernel, *modulesBuffers_->data(), *segmentsInGPU, true));
 
   alpaka::enqueue(queue, checkHitspLSTask);
 #endif
@@ -763,7 +730,7 @@ void SDL::Event<SDL::Acc>::createTrackCandidates() {
   SDL::crossCleanpLS crossCleanpLS_kernel;
   auto const crossCleanpLSTask(alpaka::createTaskKernel<Acc>(crossCleanpLS_workDiv,
                                                              crossCleanpLS_kernel,
-                                                             *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                             *modulesBuffers_->data(),
                                                              *rangesInGPU,
                                                              *pixelTripletsInGPU,
                                                              *trackCandidatesInGPU,
@@ -782,7 +749,7 @@ void SDL::Event<SDL::Acc>::createTrackCandidates() {
   SDL::addpLSasTrackCandidateInGPU addpLSasTrackCandidateInGPU_kernel;
   auto const addpLSasTrackCandidateInGPUTask(alpaka::createTaskKernel<Acc>(addpLSasTrackCandidateInGPU_workDiv,
                                                                            addpLSasTrackCandidateInGPU_kernel,
-                                                                           Globals<SDL::Dev>::nLowerModules,
+                                                                           nLowerModules_,
                                                                            *trackCandidatesInGPU,
                                                                            *segmentsInGPU));
 
@@ -824,8 +791,7 @@ void SDL::Event<SDL::Acc>::createPixelTriplets() {
   unsigned int nInnerSegments;
   auto nInnerSegments_src_view = alpaka::createView(devHost, &nInnerSegments, (size_t)1u);
 
-  auto dev_view_nSegments =
-      alpaka::createSubView(segmentsBuffers->nSegments_buf, (Idx)1u, (Idx)Globals<SDL::Dev>::nLowerModules);
+  auto dev_view_nSegments = alpaka::createSubView(segmentsBuffers->nSegments_buf, (Idx)1u, (Idx)nLowerModules_);
 
   alpaka::memcpy(queue, nInnerSegments_src_view, dev_view_nSegments);
   alpaka::wait(queue);
@@ -848,11 +814,10 @@ void SDL::Event<SDL::Acc>::createPixelTriplets() {
   unsigned int* connectedPixelIndex_host = alpaka::getPtrNative(connectedPixelIndex_host_buf);
   alpaka::wait(queue);
 
-  int pixelIndexOffsetPos = Globals<SDL::Dev>::pixelMapping->connectedPixelsIndex[size_superbins - 1] +
-                            Globals<SDL::Dev>::pixelMapping->connectedPixelsSizes[size_superbins - 1];
-  int pixelIndexOffsetNeg = Globals<SDL::Dev>::pixelMapping->connectedPixelsIndexPos[size_superbins - 1] +
-                            Globals<SDL::Dev>::pixelMapping->connectedPixelsSizesPos[size_superbins - 1] +
-                            pixelIndexOffsetPos;
+  int pixelIndexOffsetPos =
+      pixelMapping_->connectedPixelsIndex[size_superbins - 1] + pixelMapping_->connectedPixelsSizes[size_superbins - 1];
+  int pixelIndexOffsetNeg = pixelMapping_->connectedPixelsIndexPos[size_superbins - 1] +
+                            pixelMapping_->connectedPixelsSizesPos[size_superbins - 1] + pixelIndexOffsetPos;
 
   // TODO: check if a map/reduction to just eligible pLSs would speed up the kernel
   // the current selection still leaves a significant fraction of unmatchable pLSs
@@ -868,19 +833,19 @@ void SDL::Event<SDL::Acc>::createPixelTriplets() {
     // Used pixel type to select correct size-index arrays
     if (pixelType == 0) {
       connectedPixelSize_host[i] =
-          Globals<SDL::Dev>::pixelMapping->connectedPixelsSizes[superbin];  // number of connected modules to this pixel
-      auto connectedIdxBase = Globals<SDL::Dev>::pixelMapping->connectedPixelsIndex[superbin];
+          pixelMapping_->connectedPixelsSizes[superbin];  // number of connected modules to this pixel
+      auto connectedIdxBase = pixelMapping_->connectedPixelsIndex[superbin];
       connectedPixelIndex_host[i] =
           connectedIdxBase;  // index to get start of connected modules for this superbin in map
     } else if (pixelType == 1) {
       connectedPixelSize_host[i] =
-          Globals<SDL::Dev>::pixelMapping->connectedPixelsSizesPos[superbin];  // number of pixel connected modules
-      auto connectedIdxBase = Globals<SDL::Dev>::pixelMapping->connectedPixelsIndexPos[superbin] + pixelIndexOffsetPos;
+          pixelMapping_->connectedPixelsSizesPos[superbin];  // number of pixel connected modules
+      auto connectedIdxBase = pixelMapping_->connectedPixelsIndexPos[superbin] + pixelIndexOffsetPos;
       connectedPixelIndex_host[i] = connectedIdxBase;  // index to get start of connected pixel modules
     } else if (pixelType == 2) {
       connectedPixelSize_host[i] =
-          Globals<SDL::Dev>::pixelMapping->connectedPixelsSizesNeg[superbin];  // number of pixel connected modules
-      auto connectedIdxBase = Globals<SDL::Dev>::pixelMapping->connectedPixelsIndexNeg[superbin] + pixelIndexOffsetNeg;
+          pixelMapping_->connectedPixelsSizesNeg[superbin];  // number of pixel connected modules
+      auto connectedIdxBase = pixelMapping_->connectedPixelsIndexNeg[superbin] + pixelIndexOffsetNeg;
       connectedPixelIndex_host[i] = connectedIdxBase;  // index to get start of connected pixel modules
     }
   }
@@ -898,7 +863,7 @@ void SDL::Event<SDL::Acc>::createPixelTriplets() {
   auto const createPixelTripletsInGPUFromMapv2Task(
       alpaka::createTaskKernel<Acc>(createPixelTripletsInGPUFromMapv2_workDiv,
                                     createPixelTripletsInGPUFromMapv2_kernel,
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                    *modulesBuffers_->data(),
                                     *rangesInGPU,
                                     *mdsInGPU,
                                     *segmentsInGPU,
@@ -945,7 +910,7 @@ void SDL::Event<SDL::Acc>::createQuintuplets() {
   auto const createEligibleModulesListForQuintupletsGPUTask(
       alpaka::createTaskKernel<Acc>(createEligibleModulesListForQuintupletsGPU_workDiv,
                                     createEligibleModulesListForQuintupletsGPU_kernel,
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                    *modulesBuffers_->data(),
                                     *tripletsInGPU,
                                     *rangesInGPU));
 
@@ -964,8 +929,7 @@ void SDL::Event<SDL::Acc>::createQuintuplets() {
 
   if (quintupletsInGPU == nullptr) {
     quintupletsInGPU = new SDL::quintuplets();
-    quintupletsBuffers =
-        new SDL::quintupletsBuffer<Dev>(nTotalQuintuplets, Globals<SDL::Dev>::nLowerModules, devAcc, queue);
+    quintupletsBuffers = new SDL::quintupletsBuffer<Dev>(nTotalQuintuplets, nLowerModules_, devAcc, queue);
     quintupletsInGPU->setData(*quintupletsBuffers);
 
     alpaka::memcpy(queue, quintupletsBuffers->nMemoryLocations_buf, nTotalQuintuplets_buf);
@@ -980,7 +944,7 @@ void SDL::Event<SDL::Acc>::createQuintuplets() {
   SDL::createQuintupletsInGPUv2 createQuintupletsInGPUv2_kernel;
   auto const createQuintupletsInGPUv2Task(alpaka::createTaskKernel<Acc>(createQuintupletsInGPUv2_workDiv,
                                                                         createQuintupletsInGPUv2_kernel,
-                                                                        *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                                                        *modulesBuffers_->data(),
                                                                         *mdsInGPU,
                                                                         *segmentsInGPU,
                                                                         *tripletsInGPU,
@@ -999,7 +963,7 @@ void SDL::Event<SDL::Acc>::createQuintuplets() {
   auto const removeDupQuintupletsInGPUAfterBuildTask(
       alpaka::createTaskKernel<Acc>(removeDupQuintupletsInGPUAfterBuild_workDiv,
                                     removeDupQuintupletsInGPUAfterBuild_kernel,
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                    *modulesBuffers_->data(),
                                     *quintupletsInGPU,
                                     *rangesInGPU));
 
@@ -1014,7 +978,7 @@ void SDL::Event<SDL::Acc>::createQuintuplets() {
   auto const addQuintupletRangesToEventExplicitTask(
       alpaka::createTaskKernel<Acc>(addQuintupletRangesToEventExplicit_workDiv,
                                     addQuintupletRangesToEventExplicit_kernel,
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                    *modulesBuffers_->data(),
                                     *quintupletsInGPU,
                                     *rangesInGPU));
 
@@ -1035,7 +999,7 @@ void SDL::Event<SDL::Acc>::pixelLineSegmentCleaning() {
 
   SDL::checkHitspLS checkHitspLS_kernel;
   auto const checkHitspLSTask(alpaka::createTaskKernel<Acc>(
-      checkHitspLS_workDiv, checkHitspLS_kernel, *Globals<SDL::Dev>::modulesBuffersES->data(), *segmentsInGPU, false));
+      checkHitspLS_workDiv, checkHitspLS_kernel, *modulesBuffers_->data(), *segmentsInGPU, false));
 
   alpaka::enqueue(queue, checkHitspLSTask);
   alpaka::wait(queue);
@@ -1059,8 +1023,7 @@ void SDL::Event<SDL::Acc>::createPixelQuintuplets() {
   auto nInnerSegments_src_view = alpaka::createView(devHost, &nInnerSegments, (size_t)1u);
 
   // Create a sub-view for the device buffer
-  auto dev_view_nSegments =
-      alpaka::createSubView(segmentsBuffers->nSegments_buf, (Idx)1u, (Idx)Globals<SDL::Dev>::nLowerModules);
+  auto dev_view_nSegments = alpaka::createSubView(segmentsBuffers->nSegments_buf, (Idx)1u, (Idx)nLowerModules_);
 
   alpaka::memcpy(queue, nInnerSegments_src_view, dev_view_nSegments);
   alpaka::wait(queue);
@@ -1083,11 +1046,10 @@ void SDL::Event<SDL::Acc>::createPixelQuintuplets() {
   unsigned int* connectedPixelIndex_host = alpaka::getPtrNative(connectedPixelIndex_host_buf);
   alpaka::wait(queue);
 
-  int pixelIndexOffsetPos = Globals<SDL::Dev>::pixelMapping->connectedPixelsIndex[size_superbins - 1] +
-                            Globals<SDL::Dev>::pixelMapping->connectedPixelsSizes[size_superbins - 1];
-  int pixelIndexOffsetNeg = Globals<SDL::Dev>::pixelMapping->connectedPixelsIndexPos[size_superbins - 1] +
-                            Globals<SDL::Dev>::pixelMapping->connectedPixelsSizesPos[size_superbins - 1] +
-                            pixelIndexOffsetPos;
+  int pixelIndexOffsetPos =
+      pixelMapping_->connectedPixelsIndex[size_superbins - 1] + pixelMapping_->connectedPixelsSizes[size_superbins - 1];
+  int pixelIndexOffsetNeg = pixelMapping_->connectedPixelsIndexPos[size_superbins - 1] +
+                            pixelMapping_->connectedPixelsSizesPos[size_superbins - 1] + pixelIndexOffsetPos;
 
   // Loop over # pLS
   for (unsigned int i = 0; i < nInnerSegments; i++) {
@@ -1101,20 +1063,18 @@ void SDL::Event<SDL::Acc>::createPixelQuintuplets() {
     // Used pixel type to select correct size-index arrays
     if (pixelType == 0) {
       connectedPixelSize_host[i] =
-          Globals<SDL::Dev>::pixelMapping->connectedPixelsSizes[superbin];  //number of connected modules to this pixel
-      unsigned int connectedIdxBase = Globals<SDL::Dev>::pixelMapping->connectedPixelsIndex[superbin];
+          pixelMapping_->connectedPixelsSizes[superbin];  //number of connected modules to this pixel
+      unsigned int connectedIdxBase = pixelMapping_->connectedPixelsIndex[superbin];
       connectedPixelIndex_host[i] = connectedIdxBase;
     } else if (pixelType == 1) {
       connectedPixelSize_host[i] =
-          Globals<SDL::Dev>::pixelMapping->connectedPixelsSizesPos[superbin];  //number of pixel connected modules
-      unsigned int connectedIdxBase =
-          Globals<SDL::Dev>::pixelMapping->connectedPixelsIndexPos[superbin] + pixelIndexOffsetPos;
+          pixelMapping_->connectedPixelsSizesPos[superbin];  //number of pixel connected modules
+      unsigned int connectedIdxBase = pixelMapping_->connectedPixelsIndexPos[superbin] + pixelIndexOffsetPos;
       connectedPixelIndex_host[i] = connectedIdxBase;
     } else if (pixelType == 2) {
       connectedPixelSize_host[i] =
-          Globals<SDL::Dev>::pixelMapping->connectedPixelsSizesNeg[superbin];  //number of pixel connected modules
-      unsigned int connectedIdxBase =
-          Globals<SDL::Dev>::pixelMapping->connectedPixelsIndexNeg[superbin] + pixelIndexOffsetNeg;
+          pixelMapping_->connectedPixelsSizesNeg[superbin];  //number of pixel connected modules
+      unsigned int connectedIdxBase = pixelMapping_->connectedPixelsIndexNeg[superbin] + pixelIndexOffsetNeg;
       connectedPixelIndex_host[i] = connectedIdxBase;
     }
   }
@@ -1132,7 +1092,7 @@ void SDL::Event<SDL::Acc>::createPixelQuintuplets() {
   auto const createPixelQuintupletsInGPUFromMapv2Task(
       alpaka::createTaskKernel<Acc>(createPixelQuintupletsInGPUFromMapv2_workDiv,
                                     createPixelQuintupletsInGPUFromMapv2_kernel,
-                                    *Globals<SDL::Dev>::modulesBuffersES->data(),
+                                    *modulesBuffers_->data(),
                                     *mdsInGPU,
                                     *segmentsInGPU,
                                     *tripletsInGPU,
@@ -1166,7 +1126,7 @@ void SDL::Event<SDL::Acc>::createPixelQuintuplets() {
   SDL::addpT5asTrackCandidateInGPU addpT5asTrackCandidateInGPU_kernel;
   auto const addpT5asTrackCandidateInGPUTask(alpaka::createTaskKernel<Acc>(addpT5asTrackCandidateInGPU_workDiv,
                                                                            addpT5asTrackCandidateInGPU_kernel,
-                                                                           Globals<SDL::Dev>::nLowerModules,
+                                                                           nLowerModules_,
                                                                            *pixelQuintupletsInGPU,
                                                                            *trackCandidatesInGPU,
                                                                            *segmentsInGPU,
@@ -1186,19 +1146,17 @@ void SDL::Event<SDL::Acc>::createPixelQuintuplets() {
 }
 
 void SDL::Event<SDL::Acc>::addMiniDoubletsToEventExplicit() {
-  auto nMDsCPU_buf = allocBufWrapper<unsigned int>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(queue, nMDsCPU_buf, miniDoubletsBuffers->nMDs_buf, Globals<SDL::Dev>::nLowerModules);
+  auto nMDsCPU_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, nMDsCPU_buf, miniDoubletsBuffers->nMDs_buf, nLowerModules_);
 
-  auto module_subdets_buf = allocBufWrapper<short>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(
-      queue, module_subdets_buf, Globals<SDL::Dev>::modulesBuffersES->subdets_buf, Globals<SDL::Dev>::nLowerModules);
+  auto module_subdets_buf = allocBufWrapper<short>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, module_subdets_buf, modulesBuffers_->subdets_buf, nLowerModules_);
 
-  auto module_layers_buf = allocBufWrapper<short>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(
-      queue, module_layers_buf, Globals<SDL::Dev>::modulesBuffersES->layers_buf, Globals<SDL::Dev>::nLowerModules);
+  auto module_layers_buf = allocBufWrapper<short>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, module_layers_buf, modulesBuffers_->layers_buf, nLowerModules_);
 
-  auto module_hitRanges_buf = allocBufWrapper<int>(devHost, Globals<SDL::Dev>::nLowerModules * 2, queue);
-  alpaka::memcpy(queue, module_hitRanges_buf, hitsBuffers->hitRanges_buf, Globals<SDL::Dev>::nLowerModules * 2u);
+  auto module_hitRanges_buf = allocBufWrapper<int>(devHost, nLowerModules_ * 2, queue);
+  alpaka::memcpy(queue, module_hitRanges_buf, hitsBuffers->hitRanges_buf, nLowerModules_ * 2u);
 
   alpaka::wait(queue);
 
@@ -1207,7 +1165,7 @@ void SDL::Event<SDL::Acc>::addMiniDoubletsToEventExplicit() {
   short* module_layers = alpaka::getPtrNative(module_layers_buf);
   int* module_hitRanges = alpaka::getPtrNative(module_hitRanges_buf);
 
-  for (unsigned int i = 0; i < Globals<SDL::Dev>::nLowerModules; i++) {
+  for (unsigned int i = 0; i < nLowerModules_; i++) {
     if (!(nMDsCPU[i] == 0 or module_hitRanges[i * 2] == -1)) {
       if (module_subdets[i] == Barrel) {
         n_minidoublets_by_layer_barrel_[module_layers[i] - 1] += nMDsCPU[i];
@@ -1219,16 +1177,14 @@ void SDL::Event<SDL::Acc>::addMiniDoubletsToEventExplicit() {
 }
 
 void SDL::Event<SDL::Acc>::addSegmentsToEventExplicit() {
-  auto nSegmentsCPU_buf = allocBufWrapper<unsigned int>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(queue, nSegmentsCPU_buf, segmentsBuffers->nSegments_buf, Globals<SDL::Dev>::nLowerModules);
+  auto nSegmentsCPU_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, nSegmentsCPU_buf, segmentsBuffers->nSegments_buf, nLowerModules_);
 
-  auto module_subdets_buf = allocBufWrapper<short>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(
-      queue, module_subdets_buf, Globals<SDL::Dev>::modulesBuffersES->subdets_buf, Globals<SDL::Dev>::nLowerModules);
+  auto module_subdets_buf = allocBufWrapper<short>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, module_subdets_buf, modulesBuffers_->subdets_buf, nLowerModules_);
 
-  auto module_layers_buf = allocBufWrapper<short>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(
-      queue, module_layers_buf, Globals<SDL::Dev>::modulesBuffersES->layers_buf, Globals<SDL::Dev>::nLowerModules);
+  auto module_layers_buf = allocBufWrapper<short>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, module_layers_buf, modulesBuffers_->layers_buf, nLowerModules_);
 
   alpaka::wait(queue);
 
@@ -1236,7 +1192,7 @@ void SDL::Event<SDL::Acc>::addSegmentsToEventExplicit() {
   short* module_subdets = alpaka::getPtrNative(module_subdets_buf);
   short* module_layers = alpaka::getPtrNative(module_layers_buf);
 
-  for (unsigned int i = 0; i < Globals<SDL::Dev>::nLowerModules; i++) {
+  for (unsigned int i = 0; i < nLowerModules_; i++) {
     if (!(nSegmentsCPU[i] == 0)) {
       if (module_subdets[i] == Barrel) {
         n_segments_by_layer_barrel_[module_layers[i] - 1] += nSegmentsCPU[i];
@@ -1248,18 +1204,16 @@ void SDL::Event<SDL::Acc>::addSegmentsToEventExplicit() {
 }
 
 void SDL::Event<SDL::Acc>::addQuintupletsToEventExplicit() {
-  auto nQuintupletsCPU_buf = allocBufWrapper<unsigned int>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
+  auto nQuintupletsCPU_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules_, queue);
   alpaka::memcpy(queue, nQuintupletsCPU_buf, quintupletsBuffers->nQuintuplets_buf);
 
-  auto module_subdets_buf = allocBufWrapper<short>(devHost, Globals<SDL::Dev>::nModules, queue);
-  alpaka::memcpy(
-      queue, module_subdets_buf, Globals<SDL::Dev>::modulesBuffersES->subdets_buf, Globals<SDL::Dev>::nModules);
+  auto module_subdets_buf = allocBufWrapper<short>(devHost, nModules_, queue);
+  alpaka::memcpy(queue, module_subdets_buf, modulesBuffers_->subdets_buf, nModules_);
 
-  auto module_layers_buf = allocBufWrapper<short>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(
-      queue, module_layers_buf, Globals<SDL::Dev>::modulesBuffersES->layers_buf, Globals<SDL::Dev>::nLowerModules);
+  auto module_layers_buf = allocBufWrapper<short>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, module_layers_buf, modulesBuffers_->layers_buf, nLowerModules_);
 
-  auto module_quintupletModuleIndices_buf = allocBufWrapper<int>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
+  auto module_quintupletModuleIndices_buf = allocBufWrapper<int>(devHost, nLowerModules_, queue);
   alpaka::memcpy(queue, module_quintupletModuleIndices_buf, rangesBuffers->quintupletModuleIndices_buf);
 
   alpaka::wait(queue);
@@ -1269,7 +1223,7 @@ void SDL::Event<SDL::Acc>::addQuintupletsToEventExplicit() {
   short* module_layers = alpaka::getPtrNative(module_layers_buf);
   int* module_quintupletModuleIndices = alpaka::getPtrNative(module_quintupletModuleIndices_buf);
 
-  for (uint16_t i = 0; i < Globals<SDL::Dev>::nLowerModules; i++) {
+  for (uint16_t i = 0; i < nLowerModules_; i++) {
     if (!(nQuintupletsCPU[i] == 0 or module_quintupletModuleIndices[i] == -1)) {
       if (module_subdets[i] == Barrel) {
         n_quintuplets_by_layer_barrel_[module_layers[i] - 1] += nQuintupletsCPU[i];
@@ -1281,23 +1235,21 @@ void SDL::Event<SDL::Acc>::addQuintupletsToEventExplicit() {
 }
 
 void SDL::Event<SDL::Acc>::addTripletsToEventExplicit() {
-  auto nTripletsCPU_buf = allocBufWrapper<unsigned int>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
+  auto nTripletsCPU_buf = allocBufWrapper<unsigned int>(devHost, nLowerModules_, queue);
   alpaka::memcpy(queue, nTripletsCPU_buf, tripletsBuffers->nTriplets_buf);
 
-  auto module_subdets_buf = allocBufWrapper<short>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(
-      queue, module_subdets_buf, Globals<SDL::Dev>::modulesBuffersES->subdets_buf, Globals<SDL::Dev>::nLowerModules);
+  auto module_subdets_buf = allocBufWrapper<short>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, module_subdets_buf, modulesBuffers_->subdets_buf, nLowerModules_);
 
-  auto module_layers_buf = allocBufWrapper<short>(devHost, Globals<SDL::Dev>::nLowerModules, queue);
-  alpaka::memcpy(
-      queue, module_layers_buf, Globals<SDL::Dev>::modulesBuffersES->layers_buf, Globals<SDL::Dev>::nLowerModules);
+  auto module_layers_buf = allocBufWrapper<short>(devHost, nLowerModules_, queue);
+  alpaka::memcpy(queue, module_layers_buf, modulesBuffers_->layers_buf, nLowerModules_);
 
   alpaka::wait(queue);
   unsigned int* nTripletsCPU = alpaka::getPtrNative(nTripletsCPU_buf);
   short* module_subdets = alpaka::getPtrNative(module_subdets_buf);
   short* module_layers = alpaka::getPtrNative(module_layers_buf);
 
-  for (uint16_t i = 0; i < Globals<SDL::Dev>::nLowerModules; i++) {
+  for (uint16_t i = 0; i < nLowerModules_; i++) {
     if (nTripletsCPU[i] != 0) {
       if (module_subdets[i] == Barrel) {
         n_triplets_by_layer_barrel_[module_layers[i] - 1] += nTripletsCPU[i];
@@ -1542,7 +1494,7 @@ SDL::hitsBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getHits()  //std::shared_
     alpaka::wait(queue);
 
     unsigned int nHits = *alpaka::getPtrNative(nHits_buf);
-    hitsInCPU = new SDL::hitsBuffer<alpaka::DevCpu>(Globals<SDL::Dev>::nModules, nHits, devHost, queue);
+    hitsInCPU = new SDL::hitsBuffer<alpaka::DevCpu>(nModules_, nHits, devHost, queue);
     hitsInCPU->setData(*hitsInCPU);
 
     *alpaka::getPtrNative(hitsInCPU->nHits_buf) = nHits;
@@ -1564,7 +1516,7 @@ SDL::hitsBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getHitsInCMSSW() {
     alpaka::wait(queue);
 
     unsigned int nHits = *alpaka::getPtrNative(nHits_buf);
-    hitsInCPU = new SDL::hitsBuffer<alpaka::DevCpu>(Globals<SDL::Dev>::nModules, nHits, devHost, queue);
+    hitsInCPU = new SDL::hitsBuffer<alpaka::DevCpu>(nModules_, nHits, devHost, queue);
     hitsInCPU->setData(*hitsInCPU);
 
     *alpaka::getPtrNative(hitsInCPU->nHits_buf) = nHits;
@@ -1576,8 +1528,7 @@ SDL::hitsBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getHitsInCMSSW() {
 
 SDL::objectRangesBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getRanges() {
   if (rangesInCPU == nullptr) {
-    rangesInCPU = new SDL::objectRangesBuffer<alpaka::DevCpu>(
-        Globals<SDL::Dev>::nModules, Globals<SDL::Dev>::nLowerModules, devHost, queue);
+    rangesInCPU = new SDL::objectRangesBuffer<alpaka::DevCpu>(nModules_, nLowerModules_, devHost, queue);
     rangesInCPU->setData(*rangesInCPU);
 
     alpaka::memcpy(queue, rangesInCPU->hitRanges_buf, rangesBuffers->hitRanges_buf);
@@ -1598,7 +1549,7 @@ SDL::miniDoubletsBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getMiniDoublets()
     alpaka::wait(queue);
 
     unsigned int nMemHost = *alpaka::getPtrNative(nMemHost_buf);
-    mdsInCPU = new SDL::miniDoubletsBuffer<alpaka::DevCpu>(nMemHost, Globals<SDL::Dev>::nLowerModules, devHost, queue);
+    mdsInCPU = new SDL::miniDoubletsBuffer<alpaka::DevCpu>(nMemHost, nLowerModules_, devHost, queue);
     mdsInCPU->setData(*mdsInCPU);
 
     *alpaka::getPtrNative(mdsInCPU->nMemoryLocations_buf) = nMemHost;
@@ -1621,7 +1572,7 @@ SDL::segmentsBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getSegments() {
 
     unsigned int nMemHost = *alpaka::getPtrNative(nMemHost_buf);
     segmentsInCPU = new SDL::segmentsBuffer<alpaka::DevCpu>(
-        nMemHost, Globals<SDL::Dev>::nLowerModules, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devHost, queue);
+        nMemHost, nLowerModules_, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devHost, queue);
     segmentsInCPU->setData(*segmentsInCPU);
 
     *alpaka::getPtrNative(segmentsInCPU->nMemoryLocations_buf) = nMemHost;
@@ -1656,7 +1607,7 @@ SDL::tripletsBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getTriplets() {
     alpaka::wait(queue);
 
     unsigned int nMemHost = *alpaka::getPtrNative(nMemHost_buf);
-    tripletsInCPU = new SDL::tripletsBuffer<alpaka::DevCpu>(nMemHost, Globals<SDL::Dev>::nLowerModules, devHost, queue);
+    tripletsInCPU = new SDL::tripletsBuffer<alpaka::DevCpu>(nMemHost, nLowerModules_, devHost, queue);
     tripletsInCPU->setData(*tripletsInCPU);
 
     *alpaka::getPtrNative(tripletsInCPU->nMemoryLocations_buf) = nMemHost;
@@ -1690,8 +1641,7 @@ SDL::quintupletsBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getQuintuplets() {
     alpaka::wait(queue);
 
     unsigned int nMemHost = *alpaka::getPtrNative(nMemHost_buf);
-    quintupletsInCPU =
-        new SDL::quintupletsBuffer<alpaka::DevCpu>(nMemHost, Globals<SDL::Dev>::nLowerModules, devHost, queue);
+    quintupletsInCPU = new SDL::quintupletsBuffer<alpaka::DevCpu>(nMemHost, nLowerModules_, devHost, queue);
     quintupletsInCPU->setData(*quintupletsInCPU);
 
     *alpaka::getPtrNative(quintupletsInCPU->nMemoryLocations_buf) = nMemHost;
@@ -1855,9 +1805,9 @@ SDL::trackCandidatesBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getTrackCandid
 SDL::modulesBuffer<alpaka::DevCpu>* SDL::Event<SDL::Acc>::getModules(bool isFull) {
   if (modulesInCPU == nullptr) {
     // The last input here is just a small placeholder for the allocation.
-    modulesInCPU = new SDL::modulesBuffer<alpaka::DevCpu>(devHost);
+    modulesInCPU = new SDL::modulesBuffer<alpaka::DevCpu>(devHost, nModules_, nPixels_);
 
-    modulesInCPU->copyFromSrc(queue, *Globals<SDL::Dev>::modulesBuffersES, isFull);
+    modulesInCPU->copyFromSrc(queue, *modulesBuffers_, isFull);
   }
   return modulesInCPU;
 }
diff --git a/SDL/Event.h b/SDL/Event.h
index 7c799dcb..3d301c2c 100644
--- a/SDL/Event.h
+++ b/SDL/Event.h
@@ -4,9 +4,11 @@
 #ifdef LST_IS_CMSSW_PACKAGE
 #include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
 #include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#include "RecoTracker/LSTCore/interface/alpaka/LST.h"
 #else
 #include "Constants.h"
 #include "Module.h"
+#include "LST.h"
 #endif
 
 #include "Hit.h"
@@ -84,10 +86,27 @@ namespace SDL {
     int* superbinCPU;
     int8_t* pixelTypeCPU;
 
+    // Stuff that used to be global
+    const uint16_t nModules_;
+    const uint16_t nLowerModules_;
+    const unsigned int nPixels_;
+    const std::shared_ptr<const modulesBuffer<Dev>> modulesBuffers_;
+    const std::shared_ptr<const pixelMap> pixelMapping_;
+    const std::shared_ptr<const EndcapGeometry<Dev>> endcapGeometry_;
+
   public:
     // Constructor used for CMSSW integration. Uses an external queue.
     template <typename TQueue>
-    Event(bool verbose, TQueue const& q) : queue(q), devAcc(alpaka::getDev(q)), devHost(cms::alpakatools::host()) {
+    Event(bool verbose, TQueue const& q, const LSTESDeviceData<Dev>* deviceESData)
+        : queue(q),
+          devAcc(alpaka::getDev(q)),
+          devHost(cms::alpakatools::host()),
+          nModules_(deviceESData->nModules),
+          nLowerModules_(deviceESData->nLowerModules),
+          nPixels_(deviceESData->nPixels),
+          modulesBuffers_(deviceESData->modulesBuffers),
+          pixelMapping_(deviceESData->pixelMapping),
+          endcapGeometry_(deviceESData->endcapGeometry) {
       init(verbose);
     }
     void resetEvent();
@@ -183,9 +202,6 @@ namespace SDL {
     pixelTripletsBuffer<alpaka::DevCpu>* getPixelTriplets();
     pixelQuintupletsBuffer<alpaka::DevCpu>* getPixelQuintuplets();
     modulesBuffer<alpaka::DevCpu>* getModules(bool isFull = false);
-
-    //read from file and init
-    static void initModules(QueueAcc& queue, const MapPLStoLayer& pLStoLayer, const char* moduleMetaDataFilePath);
   };
 
 }  // namespace SDL
diff --git a/SDL/Globals.cc b/SDL/Globals.cc
deleted file mode 100644
index ab015d5b..00000000
--- a/SDL/Globals.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "Globals.h"
-
-SDL::modulesBuffer<SDL::Dev>* SDL::Globals<SDL::Dev>::modulesBuffers = nullptr;
-SDL::modulesBuffer<SDL::Dev> const* SDL::Globals<SDL::Dev>::modulesBuffersES = nullptr;
-std::shared_ptr<SDL::pixelMap> SDL::Globals<SDL::Dev>::pixelMapping = nullptr;
-uint16_t SDL::Globals<SDL::Dev>::nModules;
-uint16_t SDL::Globals<SDL::Dev>::nLowerModules;
-
-SDL::EndcapGeometry<SDL::Dev>* SDL::Globals<SDL::Dev>::endcapGeometry = nullptr;
-
-SDL::TiltedGeometry<SDL::Dev> SDL::Globals<SDL::Dev>::tiltedGeometry;
-SDL::ModuleConnectionMap<SDL::Dev> SDL::Globals<SDL::Dev>::moduleConnectionMap;
-
-void SDL::Globals<SDL::Dev>::freeEndcap() {
-  if (endcapGeometry != nullptr) {
-    delete endcapGeometry;
-    endcapGeometry = nullptr;
-  }
-}
-
-// Temporary solution to the global variables. Should be freed with shared_ptr.
-void SDL::Globals<SDL::Dev>::freeModules() {
-  if (modulesBuffers != nullptr) {
-    delete modulesBuffers;
-    modulesBuffers = nullptr;
-  }
-}
diff --git a/SDL/Globals.h b/SDL/Globals.h
deleted file mode 100644
index 9366405f..00000000
--- a/SDL/Globals.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef Globals_h
-#define Globals_h
-
-#ifdef LST_IS_CMSSW_PACKAGE
-#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
-#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
-#else
-#include "Constants.h"
-#include "Module.h"
-#endif
-
-#include "TiltedGeometry.h"
-#include "EndcapGeometry.h"
-#include "ModuleConnectionMap.h"
-#include "PixelMap.h"
-
-namespace SDL {
-  template <typename>
-  struct Globals;
-  template <>
-  struct Globals<SDL::Dev> {
-    static SDL::modulesBuffer<SDL::Dev>* modulesBuffers;
-    static SDL::modulesBuffer<SDL::Dev> const* modulesBuffersES;  // not owned const buffers
-    static uint16_t nModules;
-    static uint16_t nLowerModules;
-    static std::shared_ptr<SDL::pixelMap> pixelMapping;
-
-    static EndcapGeometry<SDL::Dev>* endcapGeometry;
-    static TiltedGeometry<SDL::Dev> tiltedGeometry;
-    static ModuleConnectionMap<SDL::Dev> moduleConnectionMap;
-
-    static void freeEndcap();
-    static void freeModules();
-  };
-
-}  // namespace SDL
-
-#endif
diff --git a/SDL/Hit.h b/SDL/Hit.h
index 22699955..dfe9c4c5 100644
--- a/SDL/Hit.h
+++ b/SDL/Hit.h
@@ -217,12 +217,12 @@ namespace SDL {
   struct hitLoopKernel {
     template <typename TAcc>
     ALPAKA_FN_ACC void operator()(TAcc const& acc,
-                                  uint16_t Endcap,            // Integer corresponding to endcap in module subdets
-                                  uint16_t TwoS,              // Integer corresponding to TwoS in moduleType
-                                  unsigned int nModules,      // Number of modules
-                                  unsigned int nEndCapMap,    // Number of elements in endcap map
-                                  unsigned int* geoMapDetId,  // DetId's from endcap map
-                                  float* geoMapPhi,           // Phi values from endcap map
+                                  uint16_t Endcap,                  // Integer corresponding to endcap in module subdets
+                                  uint16_t TwoS,                    // Integer corresponding to TwoS in moduleType
+                                  unsigned int nModules,            // Number of modules
+                                  unsigned int nEndCapMap,          // Number of elements in endcap map
+                                  const unsigned int* geoMapDetId,  // DetId's from endcap map
+                                  const float* geoMapPhi,           // Phi values from endcap map
                                   struct SDL::modules modulesInGPU,
                                   struct SDL::hits hitsInGPU,
                                   unsigned int const& nHits) const  // Total number of hits in event
diff --git a/SDL/LST.cc b/SDL/LST.cc
index 776663ea..9eb11503 100644
--- a/SDL/LST.cc
+++ b/SDL/LST.cc
@@ -5,100 +5,13 @@
 #endif
 
 #include "Event.h"
-#include "Globals.h"
 
 #include "Math/Vector3D.h"
 using XYZVector = ROOT::Math::XYZVector;
 
-namespace {
-  std::string trackLooperDir() {
-    const char* path = std::getenv("LST_BASE");
-    std::string path_str;
-    if (path != nullptr) {
-      path_str = path;
-    } else {
-      // FIXME: temporary solution, will need to pass a value from FileInPath or CMSSW search path
-      // in the `LSTProducer` or a related ES producer
-      path_str = std::getenv("CMSSW_BASE");
-      path_str += "/src/RecoTracker/LSTCore/TrackLooper";
-    }
-    return path_str;
-  }
-
-  std::string get_absolute_path_after_check_file_exists(const std::string name) {
-    std::filesystem::path fullpath = std::filesystem::absolute(name.c_str());
-    if (not std::filesystem::exists(fullpath)) {
-      std::cout << "ERROR: Could not find the file = " << fullpath << std::endl;
-      exit(2);
-    }
-    return fullpath.string();
-  }
-
-  void loadMaps(SDL::Dev const& devAccIn, SDL::QueueAcc& queue, SDL::MapPLStoLayer& pLStoLayer) {
-    // Module orientation information (DrDz or phi angles)
-    auto endcap_geom =
-        get_absolute_path_after_check_file_exists(trackLooperDir() + "/data/OT800_IT615_pt0.8/endcap_orientation.bin");
-    auto tilted_geom = get_absolute_path_after_check_file_exists(
-        trackLooperDir() + "/data/OT800_IT615_pt0.8/tilted_barrel_orientation.bin");
-    if (SDL::Globals<SDL::Dev>::endcapGeometry == nullptr) {
-      SDL::Globals<SDL::Dev>::endcapGeometry =
-          new SDL::EndcapGeometry<SDL::Dev>(devAccIn, queue, endcap_geom);  // centroid values added to the map
-    }
-
-    SDL::Globals<SDL::Dev>::tiltedGeometry.load(tilted_geom);
-
-    // Module connection map (for line segment building)
-    auto mappath = get_absolute_path_after_check_file_exists(
-        trackLooperDir() + "/data/OT800_IT615_pt0.8/module_connection_tracing_merged.bin");
-    SDL::Globals<SDL::Dev>::moduleConnectionMap.load(mappath);
-
-    auto pLSMapDir = trackLooperDir() + "/data/OT800_IT615_pt0.8/pixelmap/pLS_map";
-    const std::array<std::string, 4> connects{
-        {"_layer1_subdet5", "_layer2_subdet5", "_layer1_subdet4", "_layer2_subdet4"}};
-    std::string path;
-
-    static_assert(connects.size() == std::tuple_size<std::decay_t<decltype(pLStoLayer[0])>>{});
-    for (unsigned int i = 0; i < connects.size(); i++) {
-      auto connectData = connects[i].data();
-
-      path = pLSMapDir + connectData + ".bin";
-      pLStoLayer[0][i] = SDL::ModuleConnectionMap<SDL::Dev>(get_absolute_path_after_check_file_exists(path));
-
-      path = pLSMapDir + "_pos" + connectData + ".bin";
-      pLStoLayer[1][i] = SDL::ModuleConnectionMap<SDL::Dev>(get_absolute_path_after_check_file_exists(path));
-
-      path = pLSMapDir + "_neg" + connectData + ".bin";
-      pLStoLayer[2][i] = SDL::ModuleConnectionMap<SDL::Dev>(get_absolute_path_after_check_file_exists(path));
-    }
-  }
-
-}  // namespace
-
-void SDL::LST<SDL::Acc>::loadAndFillES(SDL::QueueAcc& queue, struct modulesBuffer<SDL::Dev>* modules) {
-  SDL::MapPLStoLayer pLStoLayer;
-  SDL::Dev const& devAccIn = alpaka::getDev(queue);
-  ::loadMaps(devAccIn, queue, pLStoLayer);
-
-  auto path =
-      get_absolute_path_after_check_file_exists(trackLooperDir() + "/data/OT800_IT615_pt0.8/sensor_centroids.bin");
-  if (SDL::Globals<SDL::Dev>::modulesBuffers == nullptr) {
-    SDL::Globals<SDL::Dev>::modulesBuffers = new SDL::modulesBuffer<SDL::Dev>(devAccIn);
-  }
-  if (SDL::Globals<SDL::Dev>::pixelMapping == nullptr) {
-    SDL::Globals<SDL::Dev>::pixelMapping = std::make_shared<SDL::pixelMap>();
-  }
-  SDL::loadModulesFromFile(modules,
-                           SDL::Globals<SDL::Dev>::nModules,
-                           SDL::Globals<SDL::Dev>::nLowerModules,
-                           *SDL::Globals<SDL::Dev>::pixelMapping,
-                           queue,
-                           path.c_str(),
-                           pLStoLayer);
-}
-
 void SDL::LST<SDL::Acc>::run(SDL::QueueAcc& queue,
-                             const SDL::modulesBuffer<SDL::Dev>* modules,
                              bool verbose,
+                             const LSTESDeviceData<SDL::Dev>* deviceESData,
                              const std::vector<float> see_px,
                              const std::vector<float> see_py,
                              const std::vector<float> see_pz,
@@ -118,8 +31,7 @@ void SDL::LST<SDL::Acc>::run(SDL::QueueAcc& queue,
                              const std::vector<float> ph2_x,
                              const std::vector<float> ph2_y,
                              const std::vector<float> ph2_z) {
-  SDL::Globals<SDL::Dev>::modulesBuffersES = modules;
-  auto event = SDL::Event<Acc>(verbose, queue);
+  auto event = SDL::Event<Acc>(verbose, queue, deviceESData);
   prepareInput(see_px,
                see_py,
                see_pz,
diff --git a/SDL/LST.h b/SDL/LST.h
index a0360932..7d9d1174 100644
--- a/SDL/LST.h
+++ b/SDL/LST.h
@@ -3,11 +3,12 @@
 
 #ifdef LST_IS_CMSSW_PACKAGE
 #include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/LSTESData.h"
 #else
 #include "Constants.h"
+#include "LSTESData.h"
 #endif
 
-#include <filesystem>
 #include <cstdlib>
 #include <numeric>
 #include <mutex>
@@ -17,9 +18,6 @@ namespace SDL {
   template <typename>
   class Event;
 
-  template <typename>
-  struct modulesBuffer;
-
   template <typename>
   class LST;
 
@@ -28,11 +26,9 @@ namespace SDL {
   public:
     LST() = default;
 
-    static void loadAndFillES(SDL::QueueAcc& queue, struct modulesBuffer<SDL::Dev>* modules);
-
-    void run(SDL::QueueAcc& queue,
-             const SDL::modulesBuffer<SDL::Dev>* modules,
+    void run(QueueAcc& queue,
              bool verbose,
+             const LSTESDeviceData<Dev>* deviceESData,
              const std::vector<float> see_px,
              const std::vector<float> see_py,
              const std::vector<float> see_pz,
diff --git a/SDL/LSTESData.cc b/SDL/LSTESData.cc
new file mode 100644
index 00000000..06dd4463
--- /dev/null
+++ b/SDL/LSTESData.cc
@@ -0,0 +1,113 @@
+#ifdef LST_IS_CMSSW_PACKAGE
+#include "RecoTracker/LSTCore/interface/alpaka/LSTESData.h"
+#else
+#include "LSTESData.h"
+#endif
+
+#include "EndcapGeometry.h"
+#include "ModuleConnectionMap.h"
+#include "TiltedGeometry.h"
+#include "PixelMap.h"
+#include "ModuleMethods.h"
+
+namespace {
+  std::string trackLooperDir() {
+    const char* path_lst_base = std::getenv("LST_BASE");
+    const char* path_tracklooperdir = std::getenv("TRACKLOOPERDIR");
+    std::string path_str;
+    if (path_lst_base != nullptr) {
+      path_str = path_lst_base;
+    } else if (path_tracklooperdir != nullptr) {
+      path_str = path_tracklooperdir;
+    } else {
+      // FIXME: temporary solution, will need to pass a value from FileInPath or CMSSW search path
+      // in the `LSTProducer` or a related ES producer
+      path_str = std::getenv("CMSSW_BASE");
+      path_str += "/src/RecoTracker/LSTCore/TrackLooper";
+    }
+    return path_str;
+  }
+
+  std::string get_absolute_path_after_check_file_exists(const std::string name) {
+    std::filesystem::path fullpath = std::filesystem::absolute(name.c_str());
+    if (not std::filesystem::exists(fullpath)) {
+      std::cout << "ERROR: Could not find the file = " << fullpath << std::endl;
+      exit(2);
+    }
+    return fullpath.string();
+  }
+
+  void loadMapsHost(SDL::MapPLStoLayer& pLStoLayer,
+                    std::shared_ptr<SDL::EndcapGeometryHost<SDL::Dev>> endcapGeometry,
+                    std::shared_ptr<SDL::TiltedGeometry<SDL::Dev>> tiltedGeometry,
+                    std::shared_ptr<SDL::ModuleConnectionMap<SDL::Dev>> moduleConnectionMap) {
+    // Module orientation information (DrDz or phi angles)
+    auto endcap_geom =
+        get_absolute_path_after_check_file_exists(trackLooperDir() + "/data/OT800_IT615_pt0.8/endcap_orientation.bin");
+    auto tilted_geom = get_absolute_path_after_check_file_exists(
+        trackLooperDir() + "/data/OT800_IT615_pt0.8/tilted_barrel_orientation.bin");
+    // Module connection map (for line segment building)
+    auto mappath = get_absolute_path_after_check_file_exists(
+        trackLooperDir() + "/data/OT800_IT615_pt0.8/module_connection_tracing_merged.bin");
+
+    endcapGeometry->load(endcap_geom);
+    tiltedGeometry->load(tilted_geom);
+    moduleConnectionMap->load(mappath);
+
+    auto pLSMapDir = trackLooperDir() + "/data/OT800_IT615_pt0.8/pixelmap/pLS_map";
+    const std::array<std::string, 4> connects{
+        {"_layer1_subdet5", "_layer2_subdet5", "_layer1_subdet4", "_layer2_subdet4"}};
+    std::string path;
+
+    static_assert(connects.size() == std::tuple_size<std::decay_t<decltype(pLStoLayer[0])>>{});
+    for (unsigned int i = 0; i < connects.size(); i++) {
+      auto connectData = connects[i].data();
+
+      path = pLSMapDir + connectData + ".bin";
+      pLStoLayer[0][i] = SDL::ModuleConnectionMap<SDL::Dev>(get_absolute_path_after_check_file_exists(path));
+
+      path = pLSMapDir + "_pos" + connectData + ".bin";
+      pLStoLayer[1][i] = SDL::ModuleConnectionMap<SDL::Dev>(get_absolute_path_after_check_file_exists(path));
+
+      path = pLSMapDir + "_neg" + connectData + ".bin";
+      pLStoLayer[2][i] = SDL::ModuleConnectionMap<SDL::Dev>(get_absolute_path_after_check_file_exists(path));
+    }
+  }
+}  // namespace
+
+std::unique_ptr<SDL::LSTESHostData<SDL::Dev>> SDL::loadAndFillESHost() {
+  auto pLStoLayer = std::make_shared<SDL::MapPLStoLayer>();
+  auto endcapGeometry = std::make_shared<SDL::EndcapGeometryHost<SDL::Dev>>();
+  auto tiltedGeometry = std::make_shared<SDL::TiltedGeometry<SDL::Dev>>();
+  auto moduleConnectionMap = std::make_shared<SDL::ModuleConnectionMap<SDL::Dev>>();
+  ::loadMapsHost(*pLStoLayer, endcapGeometry, tiltedGeometry, moduleConnectionMap);
+  return std::make_unique<LSTESHostData<SDL::Dev>>(pLStoLayer, endcapGeometry, tiltedGeometry, moduleConnectionMap);
+}
+
+std::unique_ptr<SDL::LSTESDeviceData<SDL::Dev>> SDL::loadAndFillESDevice(SDL::QueueAcc& queue,
+                                                                         const LSTESHostData<SDL::Dev>* hostData) {
+  SDL::Dev const& devAccIn = alpaka::getDev(queue);
+  uint16_t nModules;
+  uint16_t nLowerModules;
+  unsigned int nPixels;
+  std::shared_ptr<SDL::modulesBuffer<SDL::Dev>> modulesBuffers = nullptr;
+  auto endcapGeometry = std::make_shared<SDL::EndcapGeometry<SDL::Dev>>(devAccIn, queue, *hostData->endcapGeometry);
+  auto pixelMapping = std::make_shared<SDL::pixelMap>();
+  auto moduleConnectionMap = hostData->moduleConnectionMap;
+
+  auto path =
+      get_absolute_path_after_check_file_exists(trackLooperDir() + "/data/OT800_IT615_pt0.8/sensor_centroids.bin");
+  SDL::loadModulesFromFile(queue,
+                           hostData->mapPLStoLayer.get(),
+                           path.c_str(),
+                           nModules,
+                           nLowerModules,
+                           nPixels,
+                           modulesBuffers,
+                           pixelMapping.get(),
+                           endcapGeometry.get(),
+                           hostData->tiltedGeometry.get(),
+                           moduleConnectionMap.get());
+  return std::make_unique<LSTESDeviceData<SDL::Dev>>(
+      nModules, nLowerModules, nPixels, modulesBuffers, endcapGeometry, pixelMapping);
+}
diff --git a/SDL/LSTESData.h b/SDL/LSTESData.h
new file mode 100644
index 00000000..29ae19a5
--- /dev/null
+++ b/SDL/LSTESData.h
@@ -0,0 +1,94 @@
+#ifndef LSTESData_H
+#define LSTESData_H
+
+#ifdef LST_IS_CMSSW_PACKAGE
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#else
+#include "Constants.h"
+#endif
+
+#include "HeterogeneousCore/AlpakaInterface/interface/CopyToDevice.h"
+
+#include <filesystem>
+#include <memory>
+
+namespace SDL {
+
+  struct pixelMap;
+
+  template <typename>
+  class TiltedGeometry;
+
+  template <typename>
+  class ModuleConnectionMap;
+  using MapPLStoLayer = std::array<std::array<ModuleConnectionMap<Dev>, 4>, 3>;
+
+  template <typename>
+  struct modulesBuffer;
+
+  template <typename>
+  class EndcapGeometryHost;
+
+  template <typename>
+  class EndcapGeometry;
+
+  template <typename TDev>
+  struct LSTESHostData;
+
+  // FIXME: This shouldn't be a templated struct
+  template <>
+  struct LSTESHostData<Dev> {
+    std::shared_ptr<const MapPLStoLayer> mapPLStoLayer;
+    std::shared_ptr<const EndcapGeometryHost<Dev>> endcapGeometry;
+    std::shared_ptr<const TiltedGeometry<Dev>> tiltedGeometry;
+    std::shared_ptr<const ModuleConnectionMap<Dev>> moduleConnectionMap;
+
+    LSTESHostData(std::shared_ptr<MapPLStoLayer> mapPLStoLayerIn,
+                  std::shared_ptr<EndcapGeometryHost<Dev>> endcapGeometryIn,
+                  std::shared_ptr<TiltedGeometry<Dev>> tiltedGeometryIn,
+                  std::shared_ptr<ModuleConnectionMap<Dev>> moduleConnectionMapIn)
+        : mapPLStoLayer(mapPLStoLayerIn),
+          endcapGeometry(endcapGeometryIn),
+          tiltedGeometry(tiltedGeometryIn),
+          moduleConnectionMap(moduleConnectionMapIn) {}
+  };
+
+  template <typename TDev>
+  struct LSTESDeviceData {
+    uint16_t nModules;
+    uint16_t nLowerModules;
+    unsigned int nPixels;
+    std::shared_ptr<const modulesBuffer<TDev>> modulesBuffers;
+    std::shared_ptr<const EndcapGeometry<TDev>> endcapGeometry;
+    std::shared_ptr<const pixelMap> pixelMapping;
+
+    LSTESDeviceData(uint16_t nModulesIn,
+                    uint16_t nLowerModulesIn,
+                    unsigned int nPixelsIn,
+                    std::shared_ptr<modulesBuffer<TDev>> modulesBuffersIn,
+                    std::shared_ptr<EndcapGeometry<TDev>> endcapGeometryIn,
+                    std::shared_ptr<pixelMap> pixelMappingIn)
+        : nModules(nModulesIn),
+          nLowerModules(nLowerModulesIn),
+          nPixels(nPixelsIn),
+          modulesBuffers(modulesBuffersIn),
+          endcapGeometry(endcapGeometryIn),
+          pixelMapping(pixelMappingIn) {}
+  };
+
+  std::unique_ptr<LSTESHostData<Dev>> loadAndFillESHost();
+  std::unique_ptr<LSTESDeviceData<Dev>> loadAndFillESDevice(SDL::QueueAcc& queue, const LSTESHostData<Dev>* hostData);
+
+}  // namespace SDL
+
+namespace cms::alpakatools {
+  template <>
+  struct CopyToDevice<SDL::LSTESHostData<SDL::Dev>> {
+    template <typename TQueue>
+    static auto copyAsync(TQueue& queue, SDL::LSTESHostData<SDL::Dev> const& hostData) {
+      return std::make_unique<SDL::LSTESHostData<SDL::Dev>>(hostData);
+    }
+  };
+}  // namespace cms::alpakatools
+
+#endif
diff --git a/SDL/Module.h b/SDL/Module.h
index a6b86e78..0a269eaa 100644
--- a/SDL/Module.h
+++ b/SDL/Module.h
@@ -288,7 +288,7 @@ namespace SDL {
     Buf<TDev, int> sdlLayers_buf;
     Buf<TDev, unsigned int> connectedPixels_buf;
 
-    modulesBuffer(TDev const& dev, unsigned int nMod = modules_size, unsigned int nPixs = pix_tot)
+    modulesBuffer(TDev const& dev, unsigned int nMod, unsigned int nPixs)
         : detIds_buf(allocBufWrapper<unsigned int>(dev, nMod)),
           moduleMap_buf(allocBufWrapper<uint16_t>(dev, nMod * MAX_CONNECTED_MODULES)),
           mapdetId_buf(allocBufWrapper<unsigned int>(dev, nMod)),
@@ -360,10 +360,7 @@ namespace SDL {
     }
 
     template <typename TQueue>
-    modulesBuffer(TQueue queue,
-                  const modulesBuffer<alpaka::DevCpu>& src,
-                  unsigned int nMod = modules_size,
-                  unsigned int nPixs = pix_tot)
+    modulesBuffer(TQueue queue, const modulesBuffer<alpaka::DevCpu>& src, unsigned int nMod, unsigned int nPixs)
         : modulesBuffer(alpaka::getDev(queue), nMod, nPixs) {
       copyFromSrc(queue, src);
     }
diff --git a/SDL/ModuleMethods.h b/SDL/ModuleMethods.h
index e7d781ec..dc0eb0fc 100644
--- a/SDL/ModuleMethods.h
+++ b/SDL/ModuleMethods.h
@@ -16,7 +16,6 @@
 #include "EndcapGeometry.h"
 #include "ModuleConnectionMap.h"
 #include "PixelMap.h"
-#include "Globals.h"
 
 #include "HeterogeneousCore/AlpakaInterface/interface/host.h"
 
@@ -30,9 +29,11 @@ namespace SDL {
     // https://github.com/cms-sw/cmssw/blob/5e809e8e0a625578aa265dc4b128a93830cb5429/Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h#L29
   };
 
-  template <typename TQueue, typename TDev>
-  inline void fillPixelMap(struct modulesBuffer<TDev>* modulesBuf,
-                           struct pixelMap& pixelMapping,
+  template <typename TQueue>
+  inline void fillPixelMap(std::shared_ptr<modulesBuffer<Dev>>& modulesBuf,
+                           uint16_t nModules,
+                           unsigned int& nPixels,
+                           pixelMap& pixelMapping,
                            TQueue queue,
                            const MapPLStoLayer& pLStoLayer,
                            struct ModuleMetaData& mmd) {
@@ -84,13 +85,12 @@ namespace SDL {
     }
 
     unsigned int connectedPix_size = totalSizes + totalSizes_pos + totalSizes_neg;
+    nPixels = connectedPix_size;
 
-    // Temporary check for module initialization.
-    if (pix_tot != connectedPix_size) {
-      std::cerr << "\nError: pix_tot and connectedPix_size are not equal.\n";
-      std::cerr << "pix_tot: " << pix_tot << ", connectedPix_size: " << connectedPix_size << "\n";
-      std::cerr << "Please change pix_tot in Constants.h to make it equal to connectedPix_size.\n";
-      throw std::runtime_error("Mismatched sizes");
+    // Now we can initialize modulesBuf
+    if (modulesBuf == nullptr) {
+      SDL::Dev const& devAcc = alpaka::getDev(queue);
+      modulesBuf = std::make_shared<modulesBuffer<Dev>>(devAcc, nModules, nPixels);
     }
 
     DevHost const& devHost = cms::alpakatools::host();
@@ -115,7 +115,8 @@ namespace SDL {
   inline void fillConnectedModuleArrayExplicit(struct modulesBuffer<TDev>* modulesBuf,
                                                unsigned int nMod,
                                                TQueue queue,
-                                               struct ModuleMetaData& mmd) {
+                                               struct ModuleMetaData& mmd,
+                                               const ModuleConnectionMap<Dev>* moduleConnectionMap) {
     DevHost const& devHost = cms::alpakatools::host();
     auto moduleMap_buf = allocBufWrapper<uint16_t>(devHost, nMod * MAX_CONNECTED_MODULES);
     uint16_t* moduleMap = alpaka::getPtrNative(moduleMap_buf);
@@ -126,7 +127,7 @@ namespace SDL {
     for (auto it = mmd.detIdToIndex.begin(); it != mmd.detIdToIndex.end(); ++it) {
       unsigned int detId = it->first;
       uint16_t index = it->second;
-      auto& connectedModules = Globals<Dev>::moduleConnectionMap.getConnectedModuleDetIds(detId);
+      auto& connectedModules = moduleConnectionMap->getConnectedModuleDetIds(detId);
       nConnectedModules[index] = connectedModules.size();
       for (uint16_t i = 0; i < nConnectedModules[index]; i++) {
         moduleMap[index * MAX_CONNECTED_MODULES + i] = mmd.detIdToIndex[connectedModules[i]];
@@ -222,24 +223,20 @@ namespace SDL {
     mmd.detIdToIndex[1] = counter;  //pixel module is the last module in the module list
     counter++;
     nModules = counter;
-
-    // Temporary check for module initialization.
-    if (modules_size != nModules) {
-      std::cerr << "\nError: modules_size and nModules are not equal.\n";
-      std::cerr << "modules_size: " << modules_size << ", nModules: " << nModules << "\n";
-      std::cerr << "Please change modules_size in Constants.h to make it equal to nModules.\n";
-      throw std::runtime_error("Mismatched sizes");
-    }
   };
 
-  template <typename TQueue, typename TDev>
-  void loadModulesFromFile(struct modulesBuffer<TDev>* modulesBuf,
+  template <typename TQueue>
+  void loadModulesFromFile(TQueue& queue,
+                           const MapPLStoLayer* pLStoLayer,
+                           const char* moduleMetaDataFilePath,
                            uint16_t& nModules,
                            uint16_t& nLowerModules,
-                           struct pixelMap& pixelMapping,
-                           TQueue& queue,
-                           const char* moduleMetaDataFilePath,
-                           const MapPLStoLayer& pLStoLayer) {
+                           unsigned int& nPixels,
+                           std::shared_ptr<modulesBuffer<Dev>>& modulesBuf,
+                           pixelMap* pixelMapping,
+                           const EndcapGeometry<Dev>* endcapGeometry,
+                           const TiltedGeometry<Dev>* tiltedGeometry,
+                           const ModuleConnectionMap<Dev>* moduleConnectionMap) {
     ModuleMetaData mmd;
 
     loadCentroidsFromFile(moduleMetaDataFilePath, mmd, nModules);
@@ -359,9 +356,8 @@ namespace SDL {
           host_isAnchor[index] = false;
         }
 
-        host_dxdys[index] = (subdet == Endcap) ? Globals<Dev>::endcapGeometry->getdxdy_slope(detId)
-                                               : Globals<Dev>::tiltedGeometry.getDxDy(detId);
-        host_drdzs[index] = (subdet == Barrel) ? Globals<Dev>::tiltedGeometry.getDrDz(detId) : 0;
+        host_dxdys[index] = (subdet == Endcap) ? endcapGeometry->getdxdy_slope(detId) : tiltedGeometry->getDxDy(detId);
+        host_drdzs[index] = (subdet == Barrel) ? tiltedGeometry->getDrDz(detId) : 0;
       }
 
       host_sdlLayers[index] =
@@ -385,6 +381,9 @@ namespace SDL {
       }
     }
 
+    // modulesBuf is initialized in fillPixelMap since both nModules and nPix will be known
+    fillPixelMap(modulesBuf, nModules, nPixels, *pixelMapping, queue, *pLStoLayer, mmd);
+
     auto src_view_nModules = alpaka::createView(devHost, &nModules, (Idx)1u);
     alpaka::memcpy(queue, modulesBuf->nModules_buf, src_view_nModules);
 
@@ -412,9 +411,8 @@ namespace SDL {
     alpaka::memcpy(queue, modulesBuf->sdlLayers_buf, sdlLayers_buf);
     alpaka::wait(queue);
 
-    fillConnectedModuleArrayExplicit(modulesBuf, nModules, queue, mmd);
-    fillMapArraysExplicit(modulesBuf, nModules, queue, mmd);
-    fillPixelMap(modulesBuf, pixelMapping, queue, pLStoLayer, mmd);
+    fillConnectedModuleArrayExplicit(modulesBuf.get(), nModules, queue, mmd, moduleConnectionMap);
+    fillMapArraysExplicit(modulesBuf.get(), nModules, queue, mmd);
   };
 }  // namespace SDL
 #endif
diff --git a/SDL/TiltedGeometry.cc b/SDL/TiltedGeometry.cc
index abc94cfb..862155ab 100644
--- a/SDL/TiltedGeometry.cc
+++ b/SDL/TiltedGeometry.cc
@@ -32,17 +32,17 @@ void SDL::TiltedGeometry<SDL::Dev>::load(std::string filename) {
   }
 }
 
-float SDL::TiltedGeometry<SDL::Dev>::getDrDz(unsigned int detid) {
+float SDL::TiltedGeometry<SDL::Dev>::getDrDz(unsigned int detid) const {
   if (drdzs_.find(detid) != drdzs_.end()) {
-    return drdzs_[detid];
+    return drdzs_.at(detid);
   } else {
     return 0;
   }
 }
 
-float SDL::TiltedGeometry<SDL::Dev>::getDxDy(unsigned int detid) {
+float SDL::TiltedGeometry<SDL::Dev>::getDxDy(unsigned int detid) const {
   if (dxdys_.find(detid) != dxdys_.end()) {
-    return dxdys_[detid];
+    return dxdys_.at(detid);
   } else {
     return 0;
   }
diff --git a/SDL/TiltedGeometry.h b/SDL/TiltedGeometry.h
index 578d2ca8..51481762 100644
--- a/SDL/TiltedGeometry.h
+++ b/SDL/TiltedGeometry.h
@@ -31,8 +31,8 @@ namespace SDL {
 
     void load(std::string);
 
-    float getDrDz(unsigned int detid);
-    float getDxDy(unsigned int detid);
+    float getDrDz(unsigned int detid) const;
+    float getDxDy(unsigned int detid) const;
   };
 
 }  // namespace SDL
diff --git a/bin/sdl.cc b/bin/sdl.cc
index 3c37053d..b4f52d13 100644
--- a/bin/sdl.cc
+++ b/bin/sdl.cc
@@ -306,7 +306,8 @@ void run_sdl()
     // Load various maps used in the SDL reconstruction
     TStopwatch full_timer;
     full_timer.Start();
-    loadMaps(devAcc, queues[0]);
+    auto hostESData = SDL::loadAndFillESHost();
+    auto deviceESData = SDL::loadAndFillESDevice(queues[0], hostESData.get());
     float timeForMapLoading = full_timer.RealTime()*1000;
 
     if (ana.do_write_ntuple)
@@ -388,7 +389,11 @@ void run_sdl()
     std::vector<SDL::Event<SDL::Acc>*> events;
     for (int s = 0; s < ana.streams; s++)
     {
-        SDL::Event<SDL::Acc> *event = new SDL::Event<SDL::Acc>(ana.verbose>=2, queues[s]);
+        SDL::Event<SDL::Acc> *event = new SDL::Event<SDL::Acc>(
+            ana.verbose>=2,
+            queues[s],
+            deviceESData.get()
+        );
         events.push_back(event);
     }
     float timeForEventCreation = full_timer.RealTime()*1000;
@@ -527,9 +532,5 @@ void run_sdl()
         delete events.at(s);
     }
 
-    SDL::Globals<SDL::Dev>::freeModules();
-    SDL::Globals<SDL::Dev>::freeEndcap();
-
     delete ana.output_tfile;
 }
-
diff --git a/bin/sdl.h b/bin/sdl.h
index dec3f980..c97f331d 100644
--- a/bin/sdl.h
+++ b/bin/sdl.h
@@ -19,6 +19,7 @@
 #include "SDL/EndcapGeometry.h" // SDL::EndcapGeometr
 #include "SDL/ModuleConnectionMap.h" // SDL::ModuleConnectionMap
 #include "SDL/Event.h"
+#include "SDL/LST.h"
 
 // Efficiency study modules
 #include "AnalysisConfig.h"
diff --git a/code/core/trkCore.cc b/code/core/trkCore.cc
index 9104e3aa..90a01759 100644
--- a/code/core/trkCore.cc
+++ b/code/core/trkCore.cc
@@ -1,55 +1,4 @@
 #include "trkCore.h"
-#include "Globals.h"
-
-//___________________________________________________________________________________________________________________________________________________________________________________________
-void loadMaps(SDL::Dev& devAccIn, SDL::QueueAcc& queue)
-{
-    // From the environment variable figure out the main tracklooper absolute path
-    TString TrackLooperDir = gSystem->Getenv("TRACKLOOPERDIR");
-
-    // Module orientation information (DrDz or phi angles)
-    TString endcap_geom = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/endcap_orientation.bin", TrackLooperDir.Data()).Data());
-    TString tilted_geom = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/tilted_barrel_orientation.bin", TrackLooperDir.Data()).Data());
-    TString mappath = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/module_connection_tracing_merged.bin", TrackLooperDir.Data()).Data());
-    TString centroid = get_absolute_path_after_check_file_exists(TString::Format("%s/data/OT800_IT615_pt0.8/sensor_centroids.bin", gSystem->Getenv("TRACKLOOPERDIR")).Data()).Data();
-    TString pLSMapDir = TrackLooperDir+"/data/OT800_IT615_pt0.8/pixelmap";
-
-    std::cout << "============ CMSSW_12_2_0_pre2 geometry ===========" << std::endl;
-    std::cout << "endcap geometry: " << endcap_geom << std::endl;
-    std::cout << "tilted geometry: " << tilted_geom << std::endl;
-    std::cout << "module map: " << mappath << std::endl;
-    std::cout << "pLS map: " << pLSMapDir << std::endl;
-    std::cout << "centroid: " << centroid << std::endl;
-
-    if (SDL::Globals<SDL::Dev>::endcapGeometry == nullptr) {
-      SDL::Globals<SDL::Dev>::endcapGeometry = new SDL::EndcapGeometry<SDL::Dev>(devAccIn, queue, endcap_geom.Data()); // centroid values added to the map
-    }
-    SDL::Globals<SDL::Dev>::tiltedGeometry.load(tilted_geom.Data());
-    SDL::Globals<SDL::Dev>::moduleConnectionMap.load(mappath.Data());
-
-    SDL::MapPLStoLayer pLStoLayer;
-    const std::array<string, 4> pLSMapPath{{ "layer1_subdet5", "layer2_subdet5", "layer1_subdet4", "layer2_subdet4" }};
-    static_assert(pLStoLayer[0].size() == pLSMapPath.size());
-    for (unsigned int i=0; i<pLSMapPath.size(); i++) {
-        TString path = TString::Format("%s/pLS_map_%s.bin", pLSMapDir.Data(), pLSMapPath[i].c_str()).Data();
-        pLStoLayer[0][i].load( get_absolute_path_after_check_file_exists( path.Data() ).Data() );
-
-        path = TString::Format("%s/pLS_map_pos_%s.bin", pLSMapDir.Data(), pLSMapPath[i].c_str()).Data();
-        pLStoLayer[1][i].load( get_absolute_path_after_check_file_exists( path.Data() ).Data() );
-
-        path = TString::Format("%s/pLS_map_neg_%s.bin", pLSMapDir.Data(), pLSMapPath[i].c_str()).Data();
-        pLStoLayer[2][i].load( get_absolute_path_after_check_file_exists( path.Data() ).Data() );
-    }
-
-    // WARNING: initModules must come after above load commands!! keep it at the last line here!
-    if (SDL::Globals<SDL::Dev>::modulesBuffers == nullptr) {
-      SDL::Globals<SDL::Dev>::modulesBuffers = new SDL::modulesBuffer<SDL::Dev>(devAccIn);
-    }
-    if (SDL::Globals<SDL::Dev>::pixelMapping == nullptr) {
-      SDL::Globals<SDL::Dev>::pixelMapping = std::make_shared<SDL::pixelMap>();
-    }
-    SDL::Event<SDL::Acc>::initModules(queue, pLStoLayer, centroid.Data());
-}
 
 //___________________________________________________________________________________________________________________________________________________________________________________________
 bool goodEvent()
@@ -199,7 +148,7 @@ float runQuintuplet(SDL::Event<SDL::Acc>* event)
     if (ana.verbose >= 2) std::cout << "# of Quintuplets produced endcap layer 5: " << event->getNumberOfQuintupletsByLayerEndcap(4) << std::endl;
 
     return t5_elapsed;
-   
+
 }
 
 //___________________________________________________________________________________________________________________________________________________________________________________________
@@ -258,11 +207,11 @@ float runTrackCandidateTest_v2(SDL::Event<SDL::Acc>* event)
 
 
 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
 
 
 
@@ -497,11 +446,11 @@ int getDenomSimTrkType(std::vector<int> simidxs)
 
 
 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
 
 
 
@@ -610,11 +559,11 @@ TVector3 calculateR3FromPCA(const TVector3 &p3, const float dxy, const float dz)
 
 
 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
 
 
 
@@ -1109,11 +1058,11 @@ void printTimingInformation(std::vector<std::vector<float>>& timing_information,
 
 
 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
 
 
 
@@ -1202,11 +1151,11 @@ void writeMetaData()
 
 
 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
-//  ---------------------------------- =========================================== ---------------------------------------------- 
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
+//  ---------------------------------- =========================================== ----------------------------------------------
 
 
 
@@ -1244,7 +1193,7 @@ float addInputsToLineSegmentTracking(SDL::Event<SDL::Acc> &event, bool useOMP)
     std::vector<float> ptErr_vec;
     std::vector<float> etaErr_vec;
     std::vector<float> eta_vec;
-    std::vector<float> phi_vec; 
+    std::vector<float> phi_vec;
     std::vector<int> charge_vec;
     std::vector<unsigned int> seedIdx_vec;
     std::vector<float> deltaPhi_vec;
diff --git a/code/core/trkCore.h b/code/core/trkCore.h
index d236f22a..e45ad4dc 100644
--- a/code/core/trkCore.h
+++ b/code/core/trkCore.h
@@ -13,7 +13,6 @@
 
 // --------------------- ======================== ---------------------
 
-void loadMaps(SDL::Dev& devAccIn, SDL::QueueAcc& queue);
 bool goodEvent();
 float runMiniDoublet(SDL::Event<SDL::Acc>* event, int evt);
 float runSegment(SDL::Event<SDL::Acc>* event);