ITS

Author: f3sch

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

@@ -17,20 +17,25 @@
 
 #include <type_traits>
 #include <cstdint>
+#include <tuple>
+
+#include "SimulationDataFormat/MCCompLabel.h"
 #include "CommonDataFormat/TimeStamp.h"
 #include "ReconstructionDataFormats/Vertex.h"
 
 namespace o2::its
 {
 
+template <bool IsConst, typename T>
+using maybe_const = std::conditional_t<IsConst, const T, T>;
+
 // Time estimates are given in BC
 // error needs to cover maximum 1 orbit
 // this is an asymmetric error defining an interval [time, time+error)
 using TimeEstBC = o2::dataformats::TimeStampWithError<uint32_t, uint16_t>;
 using Vertex = o2::dataformats::Vertex<TimeEstBC>;
-
-template <bool IsConst, typename T>
-using maybe_const = std::conditional_t<IsConst, const T, T>;
+// MC vertex label with purity
+using VertexLabel = std::pair<o2::MCCompLabel, float>;
 
 // simple implemnetion of logging with exp. backoff
 struct LogLogThrottler {

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

@@ -42,21 +42,18 @@ GPUhdi() constexpr float getNormalizedPhi(float phi)
 }
 
 GPUhdi() float computeCurvature(float x1, float y1, float x2, float y2, float x3, float y3)
-{
-  // in case the triangle is degenerate we return infinite curvature.
-  const float d = (x2 - x1) * (y3 - y2) - (x3 - x2) * (y2 - y1);
-  if (o2::gpu::CAMath::Abs(d) < o2::its::constants::Tolerance) {
-    return 0.f;
-  }
-  const float a =
-    0.5f * ((y3 - y2) * (y2 * y2 - y1 * y1 + x2 * x2 - x1 * x1) - (y2 - y1) * (y3 * y3 - y2 * y2 + x3 * x3 - x2 * x2));
-  const float b =
-    0.5f * ((x2 - x1) * (y3 * y3 - y2 * y2 + x3 * x3 - x2 * x2) - (x3 - x2) * (y2 * y2 - y1 * y1 + x2 * x2 - x1 * x1));
-  const float den = o2::gpu::CAMath::Hypot(d * x1 - a, d * y1 - b);
-  if (den < o2::its::constants::Tolerance) {
-    return 0.f;
+{ // in case the triangle is degenerate we return infinite curvature.
+  const float area = ((x2 - x1) * (y3 - y1)) - ((x3 - x1) * (y2 - y1));
+  if (o2::gpu::CAMath::Abs(area) < constants::Tolerance) {
+    return o2::constants::math::VeryBig;
   }
-  return -d / den;
+  const float dx1 = x2 - x1, dy1 = y2 - y1;
+  const float dx2 = x3 - x2, dy2 = y3 - y2;
+  const float dx3 = x1 - x3, dy3 = y1 - y3;
+  const float d1 = o2::gpu::CAMath::Sqrt((dx1 * dx1) + (dy1 * dy1));
+  const float d2 = o2::gpu::CAMath::Sqrt((dx2 * dx2) + (dy2 * dy2));
+  const float d3 = o2::gpu::CAMath::Sqrt((dx3 * dx3) + (dy3 * dy3));
+  return -2.f * area / (d1 * d2 * d3);
 }
 
 GPUhdi() float computeCurvatureCentreX(float x1, float y1, float x2, float y2, float x3, float y3)
@@ -91,12 +88,12 @@ GPUhdi() float smallestAngleDifference(float a, float b)
   return o2::gpu::CAMath::Remainderf(b - a, o2::constants::math::TwoPI);
 }
 
-GPUhdi() float Sq(float v)
+GPUhdi() constexpr float Sq(float v)
 {
   return v * v;
 }
 
-GPUhdi() float SqDiff(float x, float y)
+GPUhdi() constexpr float SqDiff(float x, float y)
 {
   return Sq(x - y);
 }

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

@@ -86,7 +86,7 @@ struct TimeFrame {
   gsl::span<const std::array<float, 2>> getPrimaryVerticesXAlpha(int layer, int rofId) const;
   void fillPrimaryVerticesXandAlpha();
   void addPrimaryVertex(const Vertex& vertex) { mPrimaryVertices.emplace_back(vertex); }
-  void addPrimaryVertexLabel(std::pair<MCCompLabel, float>& label) { mPrimaryVerticesLabels.push_back(label); }
+  void addPrimaryVertexLabel(const VertexLabel& label) { mPrimaryVerticesLabels.push_back(label); }
 
   int loadROFrameData(const o2::itsmft::ROFRecord& rof, gsl::span<const itsmft::Cluster> clusters,
                       const dataformats::MCTruthContainer<MCCompLabel>* mcLabels = nullptr);
@@ -276,7 +276,7 @@ struct TimeFrame {
   int mNExtendedTracks{0};
   int mNExtendedUsedClusters{0};
   bounded_vector<Vertex> mPrimaryVertices;
-  bounded_vector<std::pair<MCCompLabel, float>> mPrimaryVerticesLabels;
+  bounded_vector<VertexLabel> mPrimaryVerticesLabels;
 
   std::array<bounded_vector<Cluster>, NLayers> mUnsortedClusters;
   std::vector<bounded_vector<Tracklet>> mTracklets;

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

@@ -110,7 +110,7 @@ class TrackerTraits
 
   // Debug output
   inline void debugComputeLayerTracklets(int iteration, int layer, const Cluster& currentCls, const Cluster& nextCls, const Vertex& pv, float sigmaZ, float sigmaPhi, bool accepted);
-  inline void debugComputeLayerCells(int iteration, int layer, int currentTrkl, int nextTrkl, bool accepted);
+  inline void debugComputeLayerCells(int iteration, int layer, int currentTrkl, int nextTrkl);
   inline void debugFindCellsNeighbours(int iteration, int layer, int currentCell, int nextCell, bool accepted);
 
   std::shared_ptr<BoundedMemoryResource> mMemoryPool;