Perform some cleanups

Author: mconcas

DataFormats/Reconstruction/src/TrackParametrization.cxx

@@ -71,7 +71,7 @@ GPUd() TrackParametrization<value_T>::TrackParametrization(const dim3_t& xyz, co
   math_utils::detail::sincos(alp, sn, cs);
   // protection against cosp<0
   if (cs * pxpypz[0] + sn * pxpypz[1] < 0) {
-    LOGP(debug, "alpha from phiPos() will invalidate this track parameters, overriding to alpha from phi()");
+    LOG(debug) << "alpha from phiPos() will invalidate this track parameters, overriding to alpha from phi()";
     alp = math_utils::detail::atan2<value_T>(pxpypz[1], pxpypz[0]);
     if (sectorAlpha) {
       alp = math_utils::detail::angle2Alpha<value_t>(alp);
@@ -182,7 +182,7 @@ GPUd() bool TrackParametrization<value_T>::rotateParam(value_t alpha)
   // RS: check if rotation does no invalidate track model (cos(local_phi)>=0, i.e. particle
   // direction in local frame is along the X axis
   if ((csp * ca + snp * sa) < 0) {
-    //LOGF(warning,"Rotation failed: local cos(phi) would become {:.2f}", csp * ca + snp * sa);
+    // LOGF(warning,"Rotation failed: local cos(phi) would become {:.2f}", csp * ca + snp * sa);
     return false;
   }
   //
@@ -382,7 +382,7 @@ GPUd() bool TrackParametrization<value_T>::propagateParamToDCA(const math_utils:
   value_t xv = vtx.X() * cs + vtx.Y() * sn, yv = -vtx.X() * sn + vtx.Y() * cs, zv = vtx.Z();
   x -= xv;
   y -= yv;
-  //Estimate the impact parameter neglecting the track curvature
+  // Estimate the impact parameter neglecting the track curvature
   value_t d = math_utils::detail::abs<value_T>(x * snp - y * csp);
   if (d > maxD) {
     return false;

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/Vector.h

@@ -20,7 +20,6 @@
 #include <new>
 #include <type_traits>
 #include <vector>
-#include <iostream>
 
 #include "Stream.h"
 #include "Utils.h"

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/VertexerTraitsGPU.h

@@ -25,8 +25,6 @@
 #include "ITStracking/Definitions.h"
 #include "ITStracking/Tracklet.h"
 
-// #include "DeviceStoreVertexerGPU.h"
-#include "UniquePointer.h"
 #include "ITStrackingGPU/TimeFrameGPU.h"
 
 namespace o2

Detectors/ITSMFT/ITS/tracking/GPU/hip/CMakeLists.txt

@@ -36,7 +36,6 @@ if(HIP_ENABLED)
                  SOURCES ClusterLinesGPU.hip.cxx
                          Context.hip.cxx
                          TimeFrameGPU.hip.cxx
-                         #  DeviceStoreVertexerGPU.hip.cxx
                          Stream.hip.cxx
                          TrackerTraitsGPU.hip.cxx
                          VertexerTraitsGPU.hip.cxx

Detectors/ITSMFT/ITS/tracking/include/ITStracking/VertexerTraits.h

@@ -93,7 +93,6 @@ class VertexerTraits
   GPUhd() static const int2 getPhiBins(float phi, float deltaPhi, const IndexTableUtils&);
 
   // virtual vertexer interface
-  // virtual void reset();
   virtual void initialise(const MemoryParameters& memParams, const TrackingParameters& trackingParams);
   virtual void computeTracklets();
   virtual void computeTrackletMatching();
@@ -127,25 +126,14 @@ class VertexerTraits
 
  protected:
   unsigned char mIsGPU;
-
-  // std::vector<Line> mTracklets;
-  // std::vector<Tracklet> mComb01;
-  // std::vector<Tracklet> mComb12;
-  // std::vector<int> mFoundTracklets01;
-  // std::vector<int> mFoundTracklets12;
-  // std::array<std::vector<Cluster>, constants::its::LayersNumberVertexer> mClusters;
-
   unsigned int mDBGFlags = 0;
 
   VertexingParameters mVrtParams;
   IndexTableUtils mIndexTableUtils;
-  // std::array<std::vector<int>, LayersNumberVertexer> mIndexTables;
   std::vector<lightVertex> mVertices;
 
   // Frame related quantities
-  // std::array<std::vector<unsigned char>, 2> mUsedClusters;
   TimeFrame* mTimeFrame = nullptr;
-  // std::vector<ClusterLines> mTrackletClusters;
 };
 
 inline void VertexerTraits::initialise(const MemoryParameters& memParams, const TrackingParameters& trackingParams)
@@ -164,9 +152,6 @@ inline void VertexerTraits::updateVertexingParameters(const VertexingParameters&
   mVrtParams.phiSpan = static_cast<int>(std::ceil(mIndexTableUtils.getNphiBins() * mVrtParams.phiCut /
                                                   constants::math::TwoPi));
   mVrtParams.zSpan = static_cast<int>(std::ceil(mVrtParams.zCut * mIndexTableUtils.getInverseZCoordinate(0)));
-  // for (auto& table : mIndexTables) {
-  //   table.resize(mIndexTableUtils.getNphiBins() * mIndexTableUtils.getNzBins() + 1, 0);
-  // }
 }
 
 GPUhdi() const int2 VertexerTraits::getPhiBins(float phi, float dPhi)

Detectors/ITSMFT/ITS/tracking/src/Tracker.cxx

@@ -45,7 +45,6 @@ Tracker::Tracker(o2::its::TrackerTraits* traits)
 }
 
 Tracker::~Tracker() = default;
-#endif
 
 void Tracker::clustersToTracks(std::function<void(std::string s)> logger, std::function<void(std::string s)> error)
 {

GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu

@@ -439,9 +439,7 @@ size_t GPUReconstructionCUDA::GPUMemCpy(void* dst, const void* src, size_t size,
     for (int k = 0; k < nEvents; k++) {
       GPUFailedMsg(cudaStreamWaitEvent(mInternals->Streams[stream], ((cudaEvent_t*)evList)[k], 0));
     }
-    GPUFailedMsg(cudaMemcpyAsync(dst, src, size, toGPU == -2 ? cudaMemcpyDeviceToDevice : toGPU ? cudaMemcpyHostToDevice
-                                                                                                : cudaMemcpyDeviceToHost,
-                                 mInternals->Streams[stream]));
+    GPUFailedMsg(cudaMemcpyAsync(dst, src, size, toGPU == -2 ? cudaMemcpyDeviceToDevice : toGPU ? cudaMemcpyHostToDevice : cudaMemcpyDeviceToHost, mInternals->Streams[stream]));
   }
   if (ev) {
     GPUFailedMsg(cudaEventRecord(*(cudaEvent_t*)ev, mInternals->Streams[stream == -1 ? 0 : stream]));

GPU/GPUTracking/Base/hip/GPUReconstructionHIP.hip.cxx

@@ -473,9 +473,7 @@ size_t GPUReconstructionHIPBackend::GPUMemCpy(void* dst, const void* src, size_t
     for (int k = 0; k < nEvents; k++) {
       GPUFailedMsg(hipStreamWaitEvent(mInternals->Streams[stream], ((hipEvent_t*)evList)[k], 0));
     }
-    GPUFailedMsg(hipMemcpyAsync(dst, src, size, toGPU == -2 ? hipMemcpyDeviceToDevice : toGPU ? hipMemcpyHostToDevice
-                                                                                              : hipMemcpyDeviceToHost,
-                                mInternals->Streams[stream]));
+    GPUFailedMsg(hipMemcpyAsync(dst, src, size, toGPU == -2 ? hipMemcpyDeviceToDevice : toGPU ? hipMemcpyHostToDevice : hipMemcpyDeviceToHost, mInternals->Streams[stream]));
   }
   if (ev) {
     GPUFailedMsg(hipEventRecord(*(hipEvent_t*)ev, mInternals->Streams[stream == -1 ? 0 : stream]));