Add TrackDebugInfo into treestream

Author: mconcas

Detectors/ITSMFT/ITS/tracking/CMakeLists.txt

@@ -35,6 +35,7 @@ o2_add_library(ITStracking
 o2_target_root_dictionary(ITStracking
                           HEADERS include/ITStracking/ClusterLines.h
                                   include/ITStracking/Tracklet.h
+                                  include/ITStracking/Cluster.h
                                   include/ITStracking/TrackingConfigParam.h
                                   include/ITStracking/StandaloneDebugger.h
                           LINKDEF src/TrackingLinkDef.h)

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cluster.h

@@ -19,6 +19,7 @@
 #include <array>
 #endif
 
+#include "GPUCommonRtypes.h"
 #include "ITStracking/Definitions.h"
 #include "ITStracking/MathUtils.h"
 
@@ -43,6 +44,8 @@ struct Cluster final {
   float rCoordinate;      // = -999.f;
   int clusterId;          // = -1;
   int indexTableBinIndex; // = -1;
+
+  ClassDefNV(Cluster, 1);
 };
 
 struct TrackingFrameInfo {

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Definitions.h

@@ -21,7 +21,7 @@
 #include <array>
 #endif
 
-#define CA_DEBUG
+// #define CA_DEBUG
 
 #ifdef CA_DEBUG
 #define CA_DEBUGGER(x) x

Detectors/ITSMFT/ITS/tracking/include/ITStracking/StandaloneDebugger.h

@@ -20,23 +20,17 @@
 
 // Tracker
 #include "DataFormatsITS/TrackITS.h"
+#include "ITStracking/PrimaryVertexContext.h"
 #include "ITStracking/ROframe.h"
 
 namespace o2
 {
 
-// class MCCompLabel;
-
 namespace utils
 {
 class TreeStreamRedirector;
 }
 
-// namespace its
-// {
-// class TrackITSExt;
-// }
-
 namespace its
 {
 class Tracklet;
@@ -46,14 +40,21 @@ class ClusterLines;
 
 using constants::its::UnusedIndex;
 
+template <int numClusters = TrackITSExt::MaxClusters>
 struct FakeTrackInfo {
  public:
   FakeTrackInfo();
-  FakeTrackInfo(const ROframe& event, TrackITSExt& track) : isFake{false}, isAmbiguousId{false}, mainLabel{UnusedIndex, UnusedIndex, UnusedIndex, false}
+  FakeTrackInfo(PrimaryVertexContext* pvc, const ROframe& event, TrackITSExt& track, bool storeClusters) : isFake{false}, isAmbiguousId{false}, mainLabel{UnusedIndex, UnusedIndex, UnusedIndex, false}
   {
     occurrences.clear();
-    for (size_t iCluster{0}; iCluster < 7; ++iCluster) {
+    for (auto& c : clusStatuses) {
+      c = -1;
+    }
+    for (size_t iCluster{0}; iCluster < numClusters; ++iCluster) {
       int extIndex = track.getClusterIndex(iCluster);
+      if (extIndex == -1) {
+        continue;
+      }
       o2::MCCompLabel mcLabel = event.getClusterLabels(iCluster, extIndex);
       bool found = false;
 
@@ -62,44 +63,69 @@ struct FakeTrackInfo {
         if (mcLabel == occurrence.first) {
           ++occurrence.second;
           found = true;
+          break;
         }
       }
       if (!found) {
         occurrences.emplace_back(mcLabel, 1);
       }
     }
+    // LOG(WARN) << "Qui 1";
     if (occurrences.size() > 1) {
       isFake = true;
     }
     std::sort(std::begin(occurrences), std::end(occurrences), [](auto e1, auto e2) {
       return e1.second > e2.second;
     });
     mainLabel = occurrences[0].first;
-
-    for (auto iOcc{1}; iOcc < occurrences.size(); ++iOcc) {
+    // LOG(WARN) << "Qui 2";
+    for (size_t iOcc{1}; iOcc < occurrences.size(); ++iOcc) {
       if (occurrences[iOcc].second == occurrences[0].second) {
         isAmbiguousId = true;
         break;
       }
     }
-    for (auto iCluster{0}; iCluster < TrackITSExt::MaxClusters; ++iCluster) {
+    // LOG(WARN) << "Qui 3";
+    for (size_t iCluster{0}; iCluster < numClusters; ++iCluster) {
       int extIndex = track.getClusterIndex(iCluster);
+      if (extIndex == -1) {
+        continue;
+      }
       o2::MCCompLabel lbl = event.getClusterLabels(iCluster, extIndex);
-      if (lbl == mainLabel && occurrences[0].second > 1 && !lbl.isNoise()) { // if 7 fake clusters -> occurrences[0].second = 1
+      if (lbl == mainLabel && occurrences[0].second > 1 && !lbl.isNoise()) { // if we have MaxClusters fake clusters -> occurrences[0].second = 1
         clusStatuses[iCluster] = 1;
       } else {
         clusStatuses[iCluster] = 0;
         ++nFakeClusters;
       }
     }
+    // LOG(WARN) << "Qui 3.5";
+    if (storeClusters) {
+      for (auto iCluster{0}; iCluster < numClusters; ++iCluster) {
+        const int index = track.getClusterIndex(iCluster);
+        if (index != constants::its::UnusedIndex) {
+          clusters[iCluster] = pvc->getClusters()[iCluster][track.getClusterIndex(iCluster)];
+        }
+        // LOG(WARN) << "Qui 3.5.1";
+        // LOG(WARN) << "\t iCLuster " << iCluster;
+        // LOG(WARN) << "\t getClusterIndex(iCluster) " << track.getClusterIndex(iCluster);
+        // LOG(WARN) << "\t externalIndex " << event.getClusterExternalIndex(iCluster, track.getClusterIndex(iCluster));
+      }
+    }
+    // LOG(WARN) << "Qui 4";
   }
-  std::vector<std::pair<MCCompLabel, int>> occurrences;
+
+  // Data
+  std::vector<std::pair<MCCompLabel, int>>
+    occurrences;
   MCCompLabel mainLabel;
-  std::array<int, 7> clusStatuses = {-1, -1, -1, -1, -1, -1, -1};
+  std::array<int, numClusters> clusStatuses;
+  std::array<o2::its::Cluster, numClusters> clusters;
   bool isFake;
   bool isAmbiguousId;
   int nFakeClusters = 0;
-};
+  ClassDefNV(FakeTrackInfo, 1);
+}; // namespace its
 
 class StandaloneDebugger
 {
@@ -130,7 +156,7 @@ class StandaloneDebugger
   void fillVerticesInfoTree(float x, float y, float z, int size, int rId, int eId, float pur);
 
   // Tracker debug utilities
-  void dumpTrackToBranchWithInfo(const ROframe event, o2::its::TrackITSExt track, std::string branchName);
+  void dumpTrackToBranchWithInfo(std::string branchName, o2::its::TrackITSExt track, const ROframe event, PrimaryVertexContext* pvc, const bool dumpClusters = false);
 
   static int getBinIndex(const float, const int, const float, const float);
 

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

@@ -12,15 +12,12 @@
 /// \brief
 /// \author matteo.concas@cern.ch
 
-
 #include "ITStracking/Cluster.h"
 #include "ITStracking/Tracklet.h"
 #include "ITStracking/ClusterLines.h"
 #include "CommonUtils/TreeStreamRedirector.h"
 #include "ITStracking/StandaloneDebugger.h"
 
-
-
 #include "TH1I.h"
 #include "TMath.h"
 
@@ -259,20 +256,19 @@ int StandaloneDebugger::getBinIndex(const float value, const int size, const flo
 }
 
 // Tracker
-void StandaloneDebugger::dumpTrackToBranchWithInfo(ROframe event, o2::its::TrackITSExt track,
-                                                   std::string branchName)
+void StandaloneDebugger::dumpTrackToBranchWithInfo(std::string branchName, o2::its::TrackITSExt track, const ROframe event, PrimaryVertexContext* pvc, const bool dumpClusters)
 {
-  // FakeTrackInfo t{event, track};
+  FakeTrackInfo<7> t{pvc, event, track, dumpClusters};
 
   (*mTreeStream)
     << branchName.data()
     << track
     << "\n";
-  
-  // (*mTreeStream)
-  //   << "TracksInfo" 
-  //   << tInfo
-  //   << "\n";
+
+  (*mTreeStream)
+    << "TracksInfo"
+    << t
+    << "\n";
 }
 } // namespace its
 } // namespace o2

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

@@ -303,7 +303,7 @@ void Tracker::findTracks(const ROframe& event)
     temporaryTrack.resetCovariance();
     fitSuccess = fitTrack(event, temporaryTrack, mTrkParams[0].NLayers - 1, -1, -1, mTrkParams[0].FitIterationMaxChi2[1]);
 #ifdef CA_DEBUG
-    mDebugger->dumpTrackToBranchWithInfo(event, temporaryTrack, "testBranch");
+    mDebugger->dumpTrackToBranchWithInfo("testBranch", temporaryTrack, event, mPrimaryVertexContext, true);
 #endif
     if (!fitSuccess) {
       continue;