Aggregated track container + global index with more provenance enums

Author: shahor02

DataFormats/Reconstruction/CMakeLists.txt

@@ -21,6 +21,7 @@ o2_add_library(ReconstructionDataFormats
                        src/PID.cxx
                        src/DCA.cxx
                        src/V0.cxx
+                       src/GlobalTrackID.cxx
                        src/VtxTrackIndex.cxx
                        src/VtxTrackRef.cxx
                PUBLIC_LINK_LIBRARIES O2::GPUCommon
@@ -41,6 +42,7 @@ o2_target_root_dictionary(
           include/ReconstructionDataFormats/PID.h
           include/ReconstructionDataFormats/DCA.h
           include/ReconstructionDataFormats/V0.h
+          include/ReconstructionDataFormats/GlobalTrackID.h
           include/ReconstructionDataFormats/VtxTrackIndex.h
           include/ReconstructionDataFormats/VtxTrackRef.h)
 

DataFormats/Reconstruction/include/ReconstructionDataFormats/GlobalTrackAccessor.h

@@ -0,0 +1,30 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// @file  GlobalTrackAccessor.h
+/// \brief Accessor for TrackParCov derived objects from multiple containers
+/// \author ruben.shahoyan@cern.ch
+
+#ifndef O2_GLOBAL_TRACK_ACCESSOR
+#define O2_GLOBAL_TRACK_ACCESSOR
+
+#include "ReconstructionDataFormats/Track.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
+#include "CommonDataFormat/AbstractRefAccessor.h"
+
+namespace o2
+{
+namespace dataformats
+{
+using GlobalTrackAccessor = AbstractRefAccessor<o2::track::TrackParCov, GlobalTrackID::NSources>;
+}
+} // namespace o2
+
+#endif

DataFormats/Reconstruction/include/ReconstructionDataFormats/GlobalTrackID.h

@@ -0,0 +1,68 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// @file  GlobalTrackID.h
+/// \brief Global index for barrel track: provides provenance (detectors combination), index in respective array and some number of bits
+/// \author ruben.shahoyan@cern.ch
+
+#ifndef O2_GLOBAL_TRACK_ID
+#define O2_GLOBAL_TRACK_ID
+
+#include "CommonDataFormat/AbstractRef.h"
+#include <iosfwd>
+#include <string>
+#include <array>
+#include <string_view>
+
+namespace o2
+{
+namespace dataformats
+{
+
+class GlobalTrackID : public AbstractRef<25, 4, 3>
+{
+ public:
+  enum Source : uint8_t { // provenance of the
+    ITS,
+    TPC,
+    TRD, // standalone tracks
+    ITSTPC,
+    TPCTOF,
+    TPCTRD, // 2-detector tracks
+    ITSTPCTRD,
+    ITSTPCTOF,
+    TPCTRDTOF,    // 3-detector tracks
+    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
+  };
+
+  using AbstractRef<25, 4, 3>::AbstractRef;
+
+  static constexpr std::string_view getSourceName(int i) { return SourceNames[i]; }
+  void print() const;
+  std::string asString() const;
+
+  operator auto() const { return AbstractRef<25, 4, 3>(); }
+
+  ClassDefNV(GlobalTrackID, 1);
+};
+
+std::ostream& operator<<(std::ostream& os, const o2::dataformats::GlobalTrackID& v);
+
+} // namespace dataformats
+} // namespace o2
+
+#endif

DataFormats/Reconstruction/src/GlobalTrackID.cxx

@@ -0,0 +1,39 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// @file  GlobalTrackID.cxx
+/// \brief Global index for barrel track: provides provenance (detectors combination), index in respective array and some number of bits
+/// \author ruben.shahoyan@cern.ch
+
+#include "ReconstructionDataFormats/GlobalTrackID.h"
+#include "Framework/Logger.h"
+#include <fmt/printf.h>
+#include <iostream>
+#include <bitset>
+
+using namespace o2::dataformats;
+
+std::string GlobalTrackID::asString() const
+{
+  std::bitset<NBitsFlags()> bits{getFlags()};
+  return fmt::format("[{:d}/{:d}/{:s}]", getIndex(), getSource(), bits.to_string());
+}
+
+std::ostream& o2::dataformats::operator<<(std::ostream& os, const o2::dataformats::GlobalTrackID& v)
+{
+  // stream itself
+  os << v.asString();
+  return os;
+}
+
+void GlobalTrackID::print() const
+{
+  LOG(INFO) << asString();
+}

DataFormats/Reconstruction/src/ReconstructionDataFormatsLinkDef.h

@@ -45,6 +45,9 @@
 #pragma link C++ class std::vector < o2::dataformats::Vertex < o2::dataformats::TimeStampWithError < float, float>>> + ;
 #pragma link C++ class std::vector < o2::dataformats::PrimaryVertex> + ;
 
+#pragma link C++ class o2::dataformats::GlobalTrackID + ;
+#pragma link C++ class std::vector < o2::dataformats::GlobalTrackID> + ;
+
 #pragma link C++ class o2::dataformats::VtxTrackIndex + ;
 #pragma link C++ class std::vector < o2::dataformats::VtxTrackIndex> + ;
 

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

@@ -581,7 +581,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
         vCollRefsTPC[trackIndex.getIndex()] = collisionID;
       } else if (source == o2::vertexing::GIndex::Source::ITS) {
         vCollRefsITS[trackIndex.getIndex()] = collisionID;
-      } else if (source == o2::vertexing::GIndex::Source::TPCITS) {
+      } else if (source == o2::vertexing::GIndex::Source::ITSTPC) {
         vCollRefsTPCITS[trackIndex.getIndex()] = collisionID;
       } else {
         LOG(WARNING) << "Unsupported track type!";
@@ -648,7 +648,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
   }
 
   if (mFillTracksITSTPC) {
-    fillTracksTable(tracksITSTPC, vCollRefsTPCITS, tracksCursor, o2::vertexing::GIndex::Source::TPCITS); // fTrackType = 0
+    fillTracksTable(tracksITSTPC, vCollRefsTPCITS, tracksCursor, o2::vertexing::GIndex::Source::ITSTPC); // fTrackType = 0
     for (int i = 0; i < tracksITSTPC.size(); i++) {
       auto& mcTruthITS = tracksITSTPC_ITSMC[i];
       auto& mcTruthTPC = tracksITSTPC_TPCMC[i];

Detectors/AOD/src/StandaloneAODProducer.cxx

@@ -169,7 +169,7 @@ void fillCollisionAndTrackTable()
             track = &((*tpctracks)[trackindex.getIndex()]);
           } else if (source == o2::dataformats::VtxTrackIndex::Source::ITS) {
             track = &((*itstracks)[trackindex.getIndex()]);
-          } else if (source == o2::dataformats::VtxTrackIndex::Source::TPCITS) {
+          } else if (source == o2::dataformats::VtxTrackIndex::Source::ITSTPC) {
             track = &((*itstpctracks)[trackindex.getIndex()]);
           } else {
             LOG(WARNING) << "Unsupported track source";