Expand GlobalTrackID enums, reduce flags to 2, fixes

shahor02 · shahor02 · commit 245bac224f91 · 2021-02-17T08:52:45.000+01:00
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/GlobalTrackID.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/GlobalTrackID.h
@@ -26,38 +26,52 @@ namespace o2
 namespace dataformats
 {
 
-class GlobalTrackID : public AbstractRef<25, 4, 3>
+class GlobalTrackID : public AbstractRef<25, 5, 2>
 {
  public:
   enum Source : uint8_t { // provenance of the
-    ITS,
+    ITS,                  // standalone detectors
     TPC,
-    TRD, // standalone tracks
-    ITSTPC,
+    TRD,
+    TOF,
+    PHS,
+    CPV,
+    EMC,
+    HMP,
+    MFT,
+    MCH,
+    MID,
+    ZDC,
+    FT0,
+    FV0,
+    FDD,
+    ITSTPC, // 2-detector tracks
     TPCTOF,
-    TPCTRD, // 2-detector tracks
-    ITSTPCTRD,
+    TPCTRD,
+    ITSTPCTRD, // 3-detector tracks
     ITSTPCTOF,
-    TPCTRDTOF,    // 3-detector tracks
+    TPCTRDTOF,
     ITSTPCTRDTOF, // full barrel track
+    //
     NSources
   };
   static constexpr std::array<std::string_view, NSources> SourceNames = {
-    "ITS", "TPC", "TRD",                   // standalone tracks
-    "ITSTPC", "TPCTOF", "TPCTRD",          // 2-detector tracks
-    "ITSTPCTRD", "ITSTPCTOF", "TPCTRDTOF", // 3-detector tracks
-    "ITSTPCTRDTOF"                         // full barrel track
+    "ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", // standalone tracks
+    "ITSTPC", "TPCTOF", "TPCTRD",                                                                            // 2-detector tracks
+    "ITSTPCTRD", "ITSTPCTOF", "TPCTRDTOF",                                                                   // 3-detector tracks
+    "ITSTPCTRDTOF"                                                                                           // full barrel track
+    //
   };
 
-  using AbstractRef<25, 4, 3>::AbstractRef;
+  using AbstractRef<25, 5, 2>::AbstractRef;
 
-  static constexpr std::string_view getSourceName(int i) { return SourceNames[i]; }
+  static auto getSourceName(int i) { return SourceNames[i]; }
   void print() const;
   std::string asString() const;
-
+  auto getSourceName() const { return getSourceName(getSource()); }
   operator int() const { return int(getIndex()); }
 
-  ClassDefNV(GlobalTrackID, 1);
+  ClassDefNV(GlobalTrackID, 2);
 };
 
 std::ostream& operator<<(std::ostream& os, const o2::dataformats::GlobalTrackID& v);
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/VtxTrackIndex.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/VtxTrackIndex.h
@@ -31,7 +31,6 @@ class VtxTrackIndex : public GlobalTrackID
  public:
   enum Flags : uint8_t {
     Contributor, // flag that it contributes to vertex fit
-    Reserved,    //
     Ambiguous,   // flag that attachment is ambiguous
     NFlags
   };
diff --git a/DataFormats/common/include/CommonDataFormat/AbstractRef.h b/DataFormats/common/include/CommonDataFormat/AbstractRef.h
@@ -66,12 +66,15 @@ class AbstractRef
   bool testBit(int i) const { return (mRef >> (NBIdx + NBSrc)) & ((0x1U << i) & FlgMask); }
   void setBit(int i) { mRef = (mRef & (BaseMask & ~(0x1U << (i + NBIdx + NBSrc)))) | (((0x1U << i) & FlgMask) << (NBIdx + NBSrc)); }
   void resetBit(int i) { mRef = (mRef & (BaseMask & ~(0x1U << (i + NBIdx + NBSrc)))); }
-  void set(Idx_t idx, Src_t src) { mRef = (mRef & (BaseMask & ~((SrcMask << NBIdx) | (BaseMask & ~IdxMask)))) | ((SrcMask & Src_t(src)) << NBIdx) | (IdxMask & Idx_t(idx)); }
+  void set(Idx_t idx, Src_t src) { mRef = (mRef & (FlgMask << (NBIdx + NBSrc))) | ((SrcMask & Src_t(src)) << NBIdx) | (IdxMask & Idx_t(idx)); }
 
   Base_t getRaw() const { return mRef; }
 
+  bool isIndexSet() const { return getIndex() != IdxMask; }
+  bool isSourceSet() const { return getSource() != SrcMask; }
+
  protected:
-  Base_t mRef = 0; // packed reference
+  Base_t mRef = IdxMask | (SrcMask << NBIdx); // packed reference, dummy by default
 
   ClassDefNV(AbstractRef, 1);
 };
diff --git a/DataFormats/common/src/CommonDataFormatLinkDef.h b/DataFormats/common/src/CommonDataFormatLinkDef.h
@@ -42,7 +42,7 @@
 
 #pragma link C++ class std::vector < o2::dataformats::RangeReference < int, int>> + ;
 
-#pragma link C++ class o2::dataformats::AbstractRef < 25, 4, 3> + ;
+#pragma link C++ class o2::dataformats::AbstractRef < 25, 5, 2> + ;
 
 #pragma link C++ class o2::InteractionRecord + ;
 #pragma link C++ class o2::InteractionTimeRecord + ;
diff --git a/DataFormats/common/test/testAbstractRefAccessor.cxx b/DataFormats/common/test/testAbstractRefAccessor.cxx
@@ -35,15 +35,15 @@ struct Bar1 : public Base {
   double b1 = 0.;
 };
 
-struct GloIdx : public AbstractRef<25, 4, 3> {
+struct GloIdx : public AbstractRef<25, 5, 2> {
   enum Source : uint8_t { // provenance of the
     ID0,
     ID1,
     ID2,
     ID3,
     NSources
   };
-  using AbstractRef<25, 4, 3>::AbstractRef;
+  using AbstractRef<25, 5, 2>::AbstractRef;
 };
 
 // basic AbstractRefAccessor
