ITS: fix vertexer and move new types

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

DataFormats/Detectors/ITSMFT/ITS/CMakeLists.txt

@@ -11,8 +11,12 @@
 
 o2_add_library(DataFormatsITS
                SOURCES src/TrackITS.cxx
+                       src/TimeEstBC.cxx
                PUBLIC_LINK_LIBRARIES O2::ReconstructionDataFormats
+                                     O2::SimulationDataFormat
                                      O2::DataFormatsITSMFT)
 
 o2_target_root_dictionary(DataFormatsITS
-                          HEADERS include/DataFormatsITS/TrackITS.h)
+                          HEADERS include/DataFormatsITS/TrackITS.h
+                                  include/DataFormatsITS/Vertex.h
+                                  include/DataFormatsITS/TimeEstBC.h)

DataFormats/Detectors/ITSMFT/ITS/include/DataFormatsITS/TimeEstBC.h

@@ -0,0 +1,86 @@
+// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#ifndef O2_TRACKINGITS_TIMEESTBC_H_
+#define O2_TRACKINGITS_TIMEESTBC_H_
+
+#include <limits>
+#include <cstdint>
+#include "CommonDataFormat/TimeStamp.h"
+#include "GPUCommonRtypes.h"
+#include "GPUCommonDef.h"
+#include "GPUCommonMath.h"
+
+namespace o2::its
+{
+// Time estimates are given in BC
+// error needs to cover maximum 1 orbit
+// this is an symmetric time error [t0-tE, t0+tE)
+using TimeStampType = uint32_t;
+using TimeStampErrorType = uint16_t;
+class TimeEstBC : public o2::dataformats::TimeStampWithError<TimeStampType, TimeStampErrorType>
+{
+ public:
+  using Base = o2::dataformats::TimeStampWithError<TimeStampType, TimeStampErrorType>;
+  GPUhdDefault() TimeEstBC() = default;
+  GPUhdi() TimeEstBC(TimeStampType t, TimeStampErrorType e) : Base(t, e) {}
+
+  // check if timestamps overlap within their interval
+  GPUhdi() bool isCompatible(const TimeEstBC& o) const noexcept
+  {
+    return !(upper() <= o.lower() || o.upper() <= lower());
+  }
+
+  GPUhdi() TimeEstBC& operator+=(const TimeEstBC& o) noexcept
+  {
+    add(o);
+    return *this;
+  }
+
+  GPUhdi() TimeEstBC operator+(const TimeEstBC& o) const noexcept
+  {
+    TimeEstBC res = *this;
+    res += o;
+    return res;
+  }
+
+ private:
+  // add the other timestmap to this one
+  // this assumes already that both overlap
+  GPUhdi() void add(const TimeEstBC& o) noexcept
+  {
+    const TimeStampType lo = o2::gpu::CAMath::Max(lower(), o.lower());
+    const TimeStampType hi = o2::gpu::CAMath::Min(upper(), o.upper());
+    const TimeStampType half = (hi - lo) / 2u;
+    this->setTimeStamp(lo + half);
+    this->setTimeStampError(static_cast<TimeStampErrorType>(half));
+  }
+
+  GPUhdi() TimeStampType upper() const noexcept
+  {
+    TimeStampType t = this->getTimeStamp();
+    TimeStampType e = this->getTimeStampError();
+    constexpr TimeStampType max = std::numeric_limits<TimeStampType>::max();
+    return (t > (max - e)) ? max : t + e;
+  }
+
+  GPUhdi() TimeStampType lower() const noexcept
+  {
+    TimeStampType t = this->getTimeStamp();
+    TimeStampType e = this->getTimeStampError();
+    return (t > e) ? (t - e) : 0u;
+  }
+
+  ClassDefNV(TimeEstBC, 1);
+};
+} // namespace o2::its
+
+#endif

DataFormats/Detectors/ITSMFT/ITS/include/DataFormatsITS/Vertex.h

@@ -0,0 +1,25 @@
+// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#ifndef O2_TRACKINGITS_VERTEX_H_
+#define O2_TRACKINGITS_VERTEX_H_
+
+#include "ReconstructionDataFormats/Vertex.h"
+#include "SimulationDataFormat/MCCompLabel.h"
+#include "DataFormatsITS/TimeEstBC.h"
+
+namespace o2::its
+{
+using Vertex = o2::dataformats::Vertex<o2::its::TimeEstBC>;
+using VertexLabel = std::pair<o2::MCCompLabel, float>;
+} // namespace o2::its
+
+#endif

DataFormats/Detectors/ITSMFT/ITS/src/DataFormatsITSLinkDef.h

@@ -14,7 +14,14 @@
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
+
 #pragma link C++ class o2::its::TrackITS + ;
 #pragma link C++ class std::vector < o2::its::TrackITS> + ;
 
+#pragma link C++ class o2::its::TimeEstBC + ;
+#pragma link C++ class std::vector < o2::its::TimeEstBC> + ;
+
+#pragma link C++ class o2::dataformats::Vertex < o2::its::TimeEstBC> + ;
+#pragma link C++ class std::vector < o2::dataformats::Vertex < o2::its::TimeEstBC>> + ;
+
 #endif

…/ITSMFT/ITS/tracking/src/Definitions.cxx …s/Detectors/ITSMFT/ITS/src/TimeEstBC.cxxDetectors/ITSMFT/ITS/tracking/src/Definitions.cxx renamed to DataFormats/Detectors/ITSMFT/ITS/src/TimeEstBC.cxx Detectors/ITSMFT/ITS/tracking/src/Definitions.cxx renamed to DataFormats/Detectors/ITSMFT/ITS/src/TimeEstBC.cxx

@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "ITStracking/Definitions.h"
+#include "DataFormatsITS/TimeEstBC.h"
 ClassImp(o2::its::TimeEstBC);

Detectors/ITSMFT/ITS/tracking/CMakeLists.txt

@@ -22,7 +22,6 @@ o2_add_library(ITStracking
                        src/ClusterLines.cxx
                        src/Vertexer.cxx
                        src/VertexerTraits.cxx
-                       src/Definitions.cxx
                PUBLIC_LINK_LIBRARIES
                        O2::GPUCommon
                        Microsoft.GSL::GSL

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

@@ -17,7 +17,7 @@
 #define TRACKINGITSU_INCLUDE_CACELL_H_
 
 #include "ITStracking/Constants.h"
-#include "ITStracking/Definitions.h"
+#include "DataFormatsITS/TimeEstBC.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "GPUCommonDef.h"
 

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

@@ -19,6 +19,7 @@
 #include <array>
 #include "ITStracking/Constants.h"
 #include "GPUCommonRtypes.h"
+#include "GPUCommonDef.h"
 
 namespace o2::its
 {

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

@@ -20,6 +20,7 @@
 #include "ITStracking/Tracklet.h"
 #include "GPUCommonRtypes.h"
 #include "GPUCommonMath.h"
+#include "GPUCommonDef.h"
 #include "GPUCommonLogger.h"
 
 namespace o2::its

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

@@ -19,7 +19,7 @@
 #include <array>
 #include <utility>
 
-#include "ITStracking/Definitions.h"
+#include "GPUCommonDef.h"
 #include "GPUCommonDefAPI.h"
 
 namespace o2::its::constants