Fixes after rebase

cms-sw · Jul 21, 2024 · 304929e · 304929e
1 parent e54c6f1
commit 304929e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc
@@ -1818,7 +1818,6 @@ lst::TrackCandidatesBuffer<DevHost>* lst::Event<Acc3D>::getTrackCandidatesInCMSS
   return trackCandidatesInCPU;
 }
 
-<<<<<<< HEAD
 lst::ModulesBuffer<DevHost>* lst::Event<Acc3D>::getModules(bool isFull) {
   if (modulesInCPU == nullptr) {
     // The last input here is just a small placeholder for the allocation.

diff --git a/RecoTracker/LSTCore/src/alpaka/LST.dev.cc b/RecoTracker/LSTCore/src/alpaka/LST.dev.cc
@@ -256,7 +256,7 @@ void lst::LST<Acc3D>::getOutput(lst::Event<Acc3D>& event) {
   std::vector<short> tc_trackCandidateType;
 
   lst::HitsBuffer<alpaka::DevCpu>& hitsInGPU = (*event.getHitsInCMSSW());
-  lst::TrackCandidatesBuffer<alpaka::DevCpu>& trackCandidatesInGPU = (*event.getTrackCandidatesInCMSSW());
+  lst::TrackCandidates const* trackCandidates = event.getTrackCandidatesInCMSSW()->data();
 
   unsigned int nTrackCandidates = *trackCandidates->nTrackCandidates;
   for (unsigned int idx = 0; idx < nTrackCandidates; idx++) {

diff --git a/RecoTracker/LSTCore/src/alpaka/ObjectRanges.h b/RecoTracker/LSTCore/src/alpaka/ObjectRanges.h
@@ -3,7 +3,7 @@
 
 #include "RecoTracker/LSTCore/interface/Constants.h"
 
-namespace SDL {
+namespace lst {
 
   struct ObjectRanges {
     int* hitRanges;
@@ -151,5 +151,5 @@ namespace SDL {
     void setData(ObjectRangesBuffer& buf) { data_.setData(buf); }
   };
 
-}  // namespace SDL
+}  // namespace lst
 #endif
diff --git a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc
@@ -305,7 +305,7 @@ void setPixelQuintupletOutputBranches(lst::Event<Acc3D>* event) {
   for (unsigned int pT5 = 0; pT5 < nPixelQuintuplets; pT5++) {
     unsigned int T5Index = getT5FrompT5(event, pT5);
     unsigned int pLSIndex = getPixelLSFrompT5(event, pT5);
-    float pt = (__H2F(quintuplets->innerRadius[T5Index]) * SDL::k2Rinv1GeVf * 2 + segments->ptIn[pLSIndex]) / 2;
+    float pt = (__H2F(quintuplets->innerRadius[T5Index]) * lst::k2Rinv1GeVf * 2 + segments->ptIn[pLSIndex]) / 2;
     float eta = segments->eta[pLSIndex];
     float phi = segments->phi[pLSIndex];