feat: support EDM4eic v3 TrackPoint

eic · Sep 7, 2023 · f3f8708 · f3f8708
1 parent 42f07f4
commit f3f8708
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/JugTrack/src/components/TrackProjector.cpp b/JugTrack/src/components/TrackProjector.cpp
@@ -22,6 +22,7 @@
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 
 // Event Model related classes
+#include "edm4eic/EDM4eicVersion.h"
 #include "edm4eic/TrackerHitCollection.h"
 #include "edm4eic/TrackParametersCollection.h"
 #include "edm4eic/TrajectoryCollection.h"
@@ -178,8 +179,17 @@ namespace Jug::Reco {
           const float pathLength = static_cast<float>(trackstate.pathLength());
           const float pathLengthError = 0;
 
+#if EDM4EIC_VERSION_MAJOR >= 3
+          uint64_t surface = 0; // trackstate.referenceSurface().geometryId().value(); FIXME - ASAN is not happy with this
+          uint32_t system = 0;
+#endif
+
           // Store track point
           track_segment.addToPoints({
+#if EDM4EIC_VERSION_MAJOR >= 3
+            surface,
+            system,
+#endif
             position,
             positionError,
             momentum,

diff --git a/external/algorithms/acts/include/algorithms/acts/TrackProjector.h b/external/algorithms/acts/include/algorithms/acts/TrackProjector.h
@@ -22,6 +22,7 @@
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 
 // Event Model related classes
+#include "edm4eic/EDM4eicVersion.h"
 #include "edm4eic/TrackerHitCollection.h"
 #include "edm4eic/TrackParametersCollection.h"
 #include "edm4eic/TrajectoryCollection.h"
@@ -179,8 +180,17 @@ namespace Jug::Reco {
           const float pathLength = static_cast<float>(trackstate.pathLength());
           const float pathLengthError = 0;
 
+#if EDM4EIC_VERSION_MAJOR >= 3
+          uint64_t surface = 0; // trackstate.referenceSurface().geometryId().value(); FIXME - ASAN is not happy with this
+          uint32_t system = 0;
+#endif
+
           // Store track point
           track_segment.addToPoints({
+#if EDM4EIC_VERSION_MAJOR >= 3
+            surface,
+            system,
+#endif
             position,
             positionError,
             momentum,