Remove Tracklet64 inheritance from CalibratedTracklet

Author: martenole

DataFormats/Detectors/TRD/include/DataFormatsTRD/CalibratedTracklet.h

@@ -11,8 +11,6 @@
 #ifndef O2_TRD_CALIBRATEDTRACKLET_H
 #define O2_TRD_CALIBRATEDTRACKLET_H
 
-#include "DataFormatsTRD/Tracklet64.h"
-
 namespace o2
 {
 namespace trd
@@ -21,12 +19,12 @@ namespace trd
 // The CalibratedTracklet has been calibrated in x and dy according to a calculated Lorentz Angle and Drift Velocity.
 // Tracklet positions in local z direction are reported at the center of the pad-row.
 // Pad-tilting correction is performed after tracking.
-class CalibratedTracklet : public Tracklet64 // OS: why do we inherit from Tracklet64? Should this not be an independent, transient data type?
+class CalibratedTracklet
 {
  public:
   CalibratedTracklet() = default;
-  CalibratedTracklet(uint64_t trackletWord, float x, float y, float z, float dy)
-    : Tracklet64(trackletWord), mx(x), my(y), mz(z), mdy(dy){};
+  CalibratedTracklet(float x, float y, float z, float dy)
+    : mx(x), my(y), mz(z), mdy(dy){};
   ~CalibratedTracklet() = default;
 
   float getX() const { return mx; }

Detectors/TRD/base/src/TrackletTransformer.cxx

@@ -141,7 +141,6 @@ std::array<float, 3> TrackletTransformer::transformL2T(int hcid, std::array<doub
 
 CalibratedTracklet TrackletTransformer::transformTracklet(Tracklet64 tracklet)
 {
-  uint64_t trackletWord = tracklet.getTrackletWord();
   uint64_t hcid = tracklet.getHCID();
   uint64_t padrow = tracklet.getPadRow();
   uint64_t column = tracklet.getColumn();
@@ -164,7 +163,5 @@ CalibratedTracklet TrackletTransformer::transformTracklet(Tracklet64 tracklet)
              << "y: " << sectorSpacePoint[1] << " | "
              << "z: " << sectorSpacePoint[2];
 
-  CalibratedTracklet calibratedTracklet = CalibratedTracklet(trackletWord, sectorSpacePoint[0], sectorSpacePoint[1], sectorSpacePoint[2], dy);
-
-  return calibratedTracklet;
+  return CalibratedTracklet(sectorSpacePoint[0], sectorSpacePoint[1], sectorSpacePoint[2], dy);
 }

Detectors/TRD/workflow/src/TRDTrackletTransformerSpec.cxx

@@ -48,8 +48,7 @@ void TRDTrackletTransformerSpec::run(o2::framework::ProcessingContext& pc)
   LOG(info) << tracklets.size() << " tracklets found!";
 
   for (const auto& tracklet : tracklets) {
-    CalibratedTracklet calibratedTracklet = mTransformer.transformTracklet(tracklet);
-    calibratedTracklets.push_back(calibratedTracklet);
+    calibratedTracklets.push_back(mTransformer.transformTracklet(tracklet));
   }
 
   pc.outputs().snapshot(Output{"TRD", "CTRACKLETS", 0, Lifetime::Timeframe}, calibratedTracklets);