UPC mask

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

Author: f3sch

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

@@ -16,9 +16,11 @@
 #ifndef ALICEO2_ITS_TRACKITS_H
 #define ALICEO2_ITS_TRACKITS_H
 
+#include <algorithm>
 #include <cstdint>
 
 #include "GPUCommonDef.h"
+#include "GPUCommonMath.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "CommonDataFormat/RangeReference.h"
 #include "DataFormatsITS/TimeEstBC.h"
@@ -36,7 +38,8 @@ namespace its
 class TrackITS : public o2::track::TrackParCov
 {
   enum UserBits {
-    kSharedClusters = 1 << 28
+    kSharedClusters = 1 << 28,
+    kUPCIteration = 1 << 29
   };
 
   using Cluster = o2::itsmft::Cluster;
@@ -127,31 +130,27 @@ class TrackITS : public o2::track::TrackParCov
 
   void setSharedClusters(bool toggle = true) { mClusterSizes = toggle ? (mClusterSizes | kSharedClusters) : (mClusterSizes & ~kSharedClusters); }
   bool hasSharedClusters() const { return mClusterSizes & kSharedClusters; }
+  void setUPCIteration() { mClusterSizes |= kUPCIteration; }
+  bool isUPCIteration() const noexcept { return mClusterSizes & kUPCIteration; }
 
   void setClusterSize(int l, int size)
   {
     if (l >= 8) {
       return;
     }
-    if (size > 15) {
-      size = 15;
-    }
+    size = o2::gpu::CAMath::Min(size, 15);
     mClusterSizes &= ~(0xf << (l * 4));
     mClusterSizes |= (size << (l * 4));
   }
 
-  int getClusterSize(int l)
+  int getClusterSize(int l) const
   {
     if (l >= 7) {
       return 0;
     }
     return (mClusterSizes >> (l * 4)) & 0xf;
   }
-
-  int getClusterSizes() const
-  {
-    return mClusterSizes;
-  }
+  auto getClusterSizes() const { return mClusterSizes; }
 
  private:
   o2::track::TrackParCov mParamOut; ///< parameter at largest radius
@@ -171,13 +170,7 @@ class TrackITSExt : public TrackITS
   static constexpr int MaxClusters = 16; /// Prepare for overlaps and new detector configurations
   using TrackITS::TrackITS;              // inherit base constructors
 
-  GPUh() 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);
-  }
-
-  GPUh() TrackITSExt(o2::track::TrackParCov& parCov, short ncl, float chi2, std::uint32_t rof, o2::track::TrackParCov& outer, std::array<int, MaxClusters> cls)
+  GPUh() TrackITSExt(const o2::track::TrackParCov& parCov, short ncl, float chi2, const o2::track::TrackParCov& outer, std::array<int, MaxClusters> cls)
     : TrackITS(parCov, chi2, outer), mIndex{cls}
   {
     setNumberOfClusters(ncl);

Detectors/ITSMFT/ITS/tracking/src/TrackerTraits.cxx

@@ -834,6 +834,9 @@ void TrackerTraits<NLayers>::acceptTracks(int iteration, bounded_vector<TrackITS
     }
     track.setUserField(0);
     track.getParamOut().setUserField(0);
+    if (mTrkParams[iteration].PassFlags[IterationStep::SelectUPCVertices]) {
+      track.setUPCIteration();
+    }
     trks.emplace_back(track);
 
     if (mTrkParams[iteration].AllowSharingFirstCluster) {