Finished cleaning namespaces

cms-sw · Sep 3, 2024 · 46f7f22 · 46f7f22
1 parent d2b9e89
commit 46f7f22
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/RecoTracker/LSTCore/standalone/bin/lst.cc b/RecoTracker/LSTCore/standalone/bin/lst.cc
@@ -3,6 +3,7 @@
 #include <typeinfo>
 
 using LSTEvent = ALPAKA_ACCELERATOR_NAMESPACE::lst::Event;
+using namespace ::lst;
 
 //___________________________________________________________________________________________________________________________________________________________________________________________
 int main(int argc, char **argv) {
@@ -340,7 +341,7 @@ void run_lst() {
   std::vector<std::vector<int>> out_charge_vec;
   std::vector<std::vector<unsigned int>> out_seedIdx_vec;
   std::vector<std::vector<int>> out_superbin_vec;
-  std::vector<std::vector<::lst::PixelType>> out_pixelType_vec;
+  std::vector<std::vector<PixelType>> out_pixelType_vec;
   std::vector<std::vector<char>> out_isQuad_vec;
   std::vector<int> evt_num;
   std::vector<TString> file_name;

diff --git a/RecoTracker/LSTCore/standalone/code/core/trkCore.cc b/RecoTracker/LSTCore/standalone/code/core/trkCore.cc
@@ -610,7 +610,7 @@ void addInputsToLineSegmentTrackingPreLoad(std::vector<std::vector<float>> &out_
                                            std::vector<std::vector<int>> &out_charge_vec,
                                            std::vector<std::vector<unsigned int>> &out_seedIdx_vec,
                                            std::vector<std::vector<int>> &out_superbin_vec,
-                                           std::vector<std::vector<::lst::PixelType>> &out_pixelType_vec,
+                                           std::vector<std::vector<PixelType>> &out_pixelType_vec,
                                            std::vector<std::vector<char>> &out_isQuad_vec) {
   unsigned int count = 0;
   auto n_see = trk.see_stateTrajGlbPx().size();
@@ -651,7 +651,7 @@ void addInputsToLineSegmentTrackingPreLoad(std::vector<std::vector<float>> &out_
   std::vector<unsigned int> hitIdxs(trk.ph2_detId().size());
 
   std::vector<int> superbin_vec;
-  std::vector<::lst::PixelType> pixelType_vec;
+  std::vector<PixelType> pixelType_vec;
   std::vector<char> isQuad_vec;
   std::iota(hitIdxs.begin(), hitIdxs.end(), 0);
   const int hit_size = trkX.size();
@@ -719,14 +719,14 @@ void addInputsToLineSegmentTrackingPreLoad(std::vector<std::vector<float>> &out_
       int charge = trk.see_q()[iSeed];
       unsigned int seedIdx = iSeed;
 
-      ::lst::PixelType pixtype = ::lst::PixelType::kInvalid;
+      PixelType pixtype = PixelType::kInvalid;
       if (ptIn >= 2.0) {
-        pixtype = ::lst::PixelType::kHighPt;
+        pixtype = PixelType::kHighPt;
       } else if (ptIn >= (PT_CUT - 2 * ptErr) and ptIn < 2.0) {
         if (pixelSegmentDeltaPhiChange >= 0) {
-          pixtype = ::lst::PixelType::kLowPtPosCurv;
+          pixtype = PixelType::kLowPtPosCurv;
         } else {
-          pixtype = ::lst::PixelType::kLowPtNegCurv;
+          pixtype = PixelType::kLowPtNegCurv;
         }
       } else {
         continue;
@@ -866,7 +866,7 @@ float addInputsToEventPreLoad(LSTEvent *event,
                               std::vector<int> charge_vec,
                               std::vector<unsigned int> seedIdx_vec,
                               std::vector<int> superbin_vec,
-                              std::vector<::lst::PixelType> pixelType_vec,
+                              std::vector<PixelType> pixelType_vec,
                               std::vector<char> isQuad_vec) {
   TStopwatch my_timer;
 

diff --git a/RecoTracker/LSTCore/standalone/code/core/trkCore.h b/RecoTracker/LSTCore/standalone/code/core/trkCore.h
@@ -13,6 +13,7 @@
 #include <filesystem>
 
 using LSTEvent = ALPAKA_ACCELERATOR_NAMESPACE::lst::Event;
+using ::lst::PixelType;
 
 // --------------------- ======================== ---------------------
 
@@ -69,7 +70,7 @@ void addInputsToLineSegmentTrackingPreLoad(std::vector<std::vector<float>> &out_
                                            std::vector<std::vector<int>> &out_charge_vec,
                                            std::vector<std::vector<unsigned int>> &out_seedIdx_vec,
                                            std::vector<std::vector<int>> &out_superbin_vec,
-                                           std::vector<std::vector<::lst::PixelType>> &out_pixelType_vec,
+                                           std::vector<std::vector<PixelType>> &out_pixelType_vec,
                                            std::vector<std::vector<char>> &out_isQuad_vec);
 
 float addInputsToEventPreLoad(LSTEvent *event,
@@ -95,7 +96,7 @@ float addInputsToEventPreLoad(LSTEvent *event,
                               std::vector<int> charge_vec,
                               std::vector<unsigned int> seedIdx_vec,
                               std::vector<int> superbin_vec,
-                              std::vector<::lst::PixelType> pixelType_vec,
+                              std::vector<PixelType> pixelType_vec,
                               std::vector<char> isQuad_vec);
 
 void printTimingInformation(std::vector<std::vector<float>> &timing_information, float fullTime, float fullavg);