Time frame based ITS tracking

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

@@ -18,6 +18,7 @@
 
 #include <vector>
 
+#include "GPUCommonDef.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "CommonDataFormat/RangeReference.h"
 
@@ -33,20 +34,24 @@ namespace its
 
 class TrackITS : public o2::track::TrackParCov
 {
+  enum UserBits {
+    kNextROF = 1
+  };
+
   using Cluster = o2::itsmft::Cluster;
   using ClusRefs = o2::dataformats::RangeRefComp<4>;
 
  public:
   using o2::track::TrackParCov::TrackParCov; // inherit base constructors
   static constexpr int MaxClusters = 16;
 
-  TrackITS() = default;
-  TrackITS(const TrackITS& t) = default;
-  TrackITS(const o2::track::TrackParCov& parcov) : o2::track::TrackParCov{parcov} {}
-  TrackITS(const o2::track::TrackParCov& parCov, float chi2, const o2::track::TrackParCov& outer)
+  GPUdDefault() TrackITS() = default;
+  GPUdDefault() TrackITS(const TrackITS& t) = default;
+  GPUd() TrackITS(const o2::track::TrackParCov& parcov) : o2::track::TrackParCov{parcov} {}
+  GPUd() TrackITS(const o2::track::TrackParCov& parCov, float chi2, const o2::track::TrackParCov& outer)
     : o2::track::TrackParCov{parCov}, mParamOut{outer}, mChi2{chi2} {}
-  TrackITS& operator=(const TrackITS& tr) = default;
-  ~TrackITS() = default;
+  GPUdDefault() TrackITS& operator=(const TrackITS& tr) = default;
+  GPUdDefault() ~TrackITS() = default;
 
   // These functions must be provided
   bool propagate(float alpha, float x, float bz);
@@ -93,6 +98,9 @@ class TrackITS : public o2::track::TrackParCov
   int getPattern() const { return mPattern; }
   bool hasHitOnLayer(int i) { return mPattern & (0x1 << i); }
 
+  void setNextROFbit(bool toggle = true) { setUserField((getUserField() & ~kNextROF) | (-toggle & kNextROF)); }
+  bool hasHitInNextROF() const { return getUserField() & kNextROF; }
+
  private:
   o2::track::TrackParCov mParamOut; ///< parameter at largest radius
   ClusRefs mClusRef;                ///< references on clusters
@@ -109,8 +117,8 @@ class TrackITSExt : public TrackITS
   static constexpr int MaxClusters = 16; /// Prepare for overlaps and new detector configurations
   using TrackITS::TrackITS; // inherit base constructors
 
-  TrackITSExt(o2::track::TrackParCov&& parCov, short ncl, float chi2,
-              o2::track::TrackParCov&& outer, std::array<int, MaxClusters> cls)
+  GPUd() TrackITSExt(o2::track::TrackParCov&& parCov, short ncl, float chi2,
+                     o2::track::TrackParCov&& outer, std::array<int, MaxClusters> cls)
     : TrackITS(parCov, chi2, outer), mIndex{cls}
   {
     setNumberOfClusters(ncl);

DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackParametrization.h

@@ -213,8 +213,8 @@ class TrackParametrization
   GPUd() bool isValid() const;
   GPUd() void invalidate();
 
-  GPUd() uint16_t getUserField() const;
-  GPUd() void setUserField(uint16_t v);
+  GPUhd() uint16_t getUserField() const;
+  GPUhd() void setUserField(uint16_t v);
 
   GPUd() void printParam() const;
 #ifndef GPUCA_ALIGPUCODE
@@ -655,13 +655,13 @@ GPUdi() void TrackParametrization<value_T>::invalidate()
 }
 
 template <typename value_T>
-GPUdi() uint16_t TrackParametrization<value_T>::getUserField() const
+GPUhdi() uint16_t TrackParametrization<value_T>::getUserField() const
 {
   return mUserField;
 }
 
 template <typename value_T>
-GPUdi() void TrackParametrization<value_T>::setUserField(uint16_t v)
+GPUhdi() void TrackParametrization<value_T>::setUserField(uint16_t v)
 {
   mUserField = v;
 }

DataFormats/simulation/include/SimulationDataFormat/MCCompLabel.h

@@ -21,13 +21,13 @@ namespace o2
 class MCCompLabel
 {
  private:
-  static constexpr ULong64_t ul0x1 = 0x1;
-  static constexpr ULong64_t NotSet = 0xffffffffffffffff;
-  static constexpr ULong64_t Noise = 0xfffffffffffffffe;
-  static constexpr ULong64_t Fake = ul0x1 << 63;
+  static constexpr uint64_t ul0x1 = 0x1;
+  static constexpr uint64_t NotSet = 0xffffffffffffffff;
+  static constexpr uint64_t Noise = 0xfffffffffffffffe;
+  static constexpr uint64_t Fake = ul0x1 << 63;
   static constexpr int NReservedBits = 1;
 
-  ULong64_t mLabel = NotSet; ///< MC label encoding MCtrack ID and MCevent origin
+  uint64_t mLabel = NotSet; ///< MC label encoding MCtrack ID and MCevent origin
 
  public:
   // number of bits reserved for MC track ID, DON'T modify this, since the
@@ -38,17 +38,17 @@ class MCCompLabel
   // the rest of the bits is reserved at the moment
 
   // check if the fields are defined consistently
-  static_assert(nbitsTrackID + nbitsEvID + nbitsSrcID <= sizeof(ULong64_t) * 8 - NReservedBits,
+  static_assert(nbitsTrackID + nbitsEvID + nbitsSrcID <= sizeof(uint64_t) * 8 - NReservedBits,
                 "Fields cannot be stored in 64 bits");
 
   // mask to extract MC track ID
-  static constexpr ULong64_t maskTrackID = (ul0x1 << nbitsTrackID) - 1;
+  static constexpr uint64_t maskTrackID = (ul0x1 << nbitsTrackID) - 1;
   // mask to extract MC track ID
-  static constexpr ULong64_t maskEvID = (ul0x1 << nbitsEvID) - 1;
+  static constexpr uint64_t maskEvID = (ul0x1 << nbitsEvID) - 1;
   // mask to extract MC track ID
-  static constexpr ULong64_t maskSrcID = (ul0x1 << nbitsSrcID) - 1;
+  static constexpr uint64_t maskSrcID = (ul0x1 << nbitsSrcID) - 1;
   // mask for all used fields
-  static constexpr ULong64_t maskFull = (ul0x1 << (nbitsTrackID + nbitsEvID + nbitsSrcID)) - 1;
+  static constexpr uint64_t maskFull = (ul0x1 << (nbitsTrackID + nbitsEvID + nbitsSrcID)) - 1;
 
   MCCompLabel(int trackID, int evID, int srcID, bool fake = false) { set(trackID, evID, srcID, fake); }
   MCCompLabel(bool noise = false)
@@ -88,7 +88,7 @@ class MCCompLabel
   }
 
   // allow to retrieve bare label
-  ULong64_t getRawValue() const { return mLabel; }
+  uint64_t getRawValue() const { return mLabel; }
 
   // comparison operator, compares only label, not eventual weight or correctness info
   bool operator==(const MCCompLabel& other) const { return (mLabel & maskFull) == (other.mLabel & maskFull); }
@@ -112,9 +112,9 @@ class MCCompLabel
   void set(unsigned int trackID, int evID, int srcID, bool fake)
   {
     /// compose label: the track 1st cast to UInt32_t to preserve the sign!
-    mLabel = (maskTrackID & static_cast<ULong64_t>(trackID)) |
-             (maskEvID & static_cast<ULong64_t>(evID)) << nbitsTrackID |
-             (maskSrcID & static_cast<ULong64_t>(srcID)) << (nbitsTrackID + nbitsEvID);
+    mLabel = (maskTrackID & static_cast<uint64_t>(trackID)) |
+             (maskEvID & static_cast<uint64_t>(evID)) << nbitsTrackID |
+             (maskSrcID & static_cast<uint64_t>(srcID)) << (nbitsTrackID + nbitsEvID);
     if (fake) {
       setFakeFlag();
     }
@@ -124,7 +124,7 @@ class MCCompLabel
   int getTrackIDSigned() const { return isFake() ? -getTrackID() : getTrackID(); }
   int getEventID() const { return (mLabel >> nbitsTrackID) & maskEvID; }
   int getSourceID() const { return (mLabel >> (nbitsTrackID + nbitsEvID)) & maskSrcID; }
-  ULong64_t getTrackEventSourceID() const { return static_cast<ULong64_t>(mLabel & maskFull); }
+  uint64_t getTrackEventSourceID() const { return static_cast<uint64_t>(mLabel & maskFull); }
   void get(int& trackID, int& evID, int& srcID, bool& fake)
   {
     /// parse label

DataFormats/simulation/include/SimulationDataFormat/MCTruthContainer.h

@@ -43,7 +43,7 @@ struct MCTruthHeaderElement {
   MCTruthHeaderElement() = default; // for ROOT IO
 
   MCTruthHeaderElement(uint32_t i) : index(i) {}
-  uint32_t index = -1; // the index into the actual MC track storage (-1 if invalid)
+  uint32_t index = (uint32_t)-1; // the index into the actual MC track storage (-1 if invalid)
   ClassDefNV(MCTruthHeaderElement, 1);
 };
 

Detectors/ITSMFT/ITS/macros/test/CMakeLists.txt

@@ -59,6 +59,13 @@ o2_add_test_root_macro(CheckTracks.C
                                              O2::DataFormatsITSMFT
                        LABELS its)
 
+o2_add_test_root_macro(CheckTracksCA.C
+                       PUBLIC_LINK_LIBRARIES O2::SimulationDataFormat
+                                             O2::ITSBase
+                                             O2::DataFormatsITS
+                                             O2::DataFormatsITSMFT
+                       LABELS its)
+
 o2_add_test_root_macro(DisplayTrack.C
                        PUBLIC_LINK_LIBRARIES O2::ITSBase
                                              O2::DataFormatsITSMFT

Detectors/ITSMFT/ITS/macros/test/CheckTracks.C

@@ -153,14 +153,16 @@ void CheckTracks(std::string tracfile = "o2trac_its.root", std::string clusfile
     if (!recTree->GetEvent(frame))
       continue;
     int loadedEventTracks = frame;
+    cout << "Number of tracks in frame " << frame << ": " << recArr->size() << std::endl;
     for (unsigned int i = 0; i < recArr->size(); i++) { // Find the last MC event within this reconstructed entry
       auto lab = (*trkLabArr)[i];
       if (!lab.isValid()) {
         const TrackITS& recTrack = (*recArr)[i];
         fak->Fill(recTrack.getPt());
       }
-      if (!lab.isValid() || lab.getSourceID() != 0 || lab.getEventID() < 0 || lab.getEventID() >= nev)
+      if (!lab.isValid() || lab.getSourceID() != 0 || lab.getEventID() < 0 || lab.getEventID() >= nev) {
         continue;
+      }
       trackFrames[lab.getEventID()].update(frame, i);
     }
   }