Use global track indices for cross-detector matches

shahor02 · shahor02 · commit b5e69045cd2b · 2021-01-25T03:35:45.000+01:00
All int indices referring to entries of various tracks in their respective sources are
substituted by o2::dataformats::GlobalTrackID, providing both the index and its source container
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/GlobalTrackID.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/GlobalTrackID.h
@@ -55,7 +55,7 @@ class GlobalTrackID : public AbstractRef<25, 4, 3>
   void print() const;
   std::string asString() const;
 
-  operator auto() const { return AbstractRef<25, 4, 3>(); }
+  operator int() const { return int(getIndex()); }
 
   ClassDefNV(GlobalTrackID, 1);
 };
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOF.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/MatchInfoTOF.h
@@ -15,6 +15,7 @@
 #define ALICEO2_MATCHINFOTOF_H
 
 #include "ReconstructionDataFormats/TrackLTIntegral.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "CommonDataFormat/EvIndex.h"
 
 namespace o2
@@ -23,15 +24,16 @@ namespace dataformats
 {
 class MatchInfoTOF
 {
+  using evGIdx = o2::dataformats::EvIndex<int, o2::dataformats::GlobalTrackID>;
   using evIdx = o2::dataformats::EvIndex<int, int>;
 
  public:
-  MatchInfoTOF(evIdx evIdxTOFCl, float chi2, o2::track::TrackLTIntegral trkIntLT, evIdx evIdxTrack = evIdx(0, 0)) : mEvIdxTOFCl(evIdxTOFCl), mChi2(chi2), mIntLT(trkIntLT), mEvIdxTrack(evIdxTrack){};
+  MatchInfoTOF(evIdx evIdxTOFCl, float chi2, o2::track::TrackLTIntegral trkIntLT, evGIdx evIdxTrack) : mEvIdxTOFCl(evIdxTOFCl), mChi2(chi2), mIntLT(trkIntLT), mEvIdxTrack(evIdxTrack){};
   MatchInfoTOF() = default;
   void setEvIdxTOFCl(evIdx index) { mEvIdxTOFCl = index; }
-  void setEvIdxTrack(evIdx index) { mEvIdxTrack = index; }
+  void setEvIdxTrack(evGIdx index) { mEvIdxTrack = index; }
   evIdx getEvIdxTOFCl() const { return mEvIdxTOFCl; }
-  evIdx getEvIdxTrack() const { return mEvIdxTrack; }
+  evGIdx getEvIdxTrack() const { return mEvIdxTrack; }
   int getEventTOFClIndex() const { return mEvIdxTOFCl.getEvent(); }
   int getTOFClIndex() const { return mEvIdxTOFCl.getIndex(); }
   int getEventTrackIndex() const { return mEvIdxTrack.getEvent(); }
@@ -47,7 +49,7 @@ class MatchInfoTOF
   float mChi2;                       // chi2 of the pair track-TOFcluster
   o2::track::TrackLTIntegral mIntLT; ///< L,TOF integral calculated during the propagation
   evIdx mEvIdxTOFCl;                 ///< EvIdx for TOF cluster (first: ev index; second: cluster index)
-  evIdx mEvIdxTrack;                 ///< EvIdx for track (first: ev index; second: cluster index)
+  evGIdx mEvIdxTrack;                ///< EvIdx for track (first: ev index; second: track global index)
 
   ClassDefNV(MatchInfoTOF, 1);
 };
diff --git a/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackTPCITS.h b/DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackTPCITS.h
@@ -17,6 +17,7 @@
 
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/TrackLTIntegral.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "CommonDataFormat/TimeStamp.h"
 
 namespace o2
@@ -35,10 +36,10 @@ class TrackTPCITS : public o2::track::TrackParCov
   TrackTPCITS(const o2::track::TrackParCov& src) : o2::track::TrackParCov(src) {}
   TrackTPCITS(const o2::track::TrackParCov& srcIn, const o2::track::TrackParCov& srcOut) : o2::track::TrackParCov(srcIn), mParamOut(srcOut) {}
 
-  int getRefTPC() const { return mRefTPC; }
-  int getRefITS() const { return mRefITS; }
-  void setRefTPC(int id) { mRefTPC = id; }
-  void setRefITS(int id) { mRefITS = id; }
+  GlobalTrackID getRefTPC() const { return mRefTPC; }
+  GlobalTrackID getRefITS() const { return mRefITS; }
+  void setRefTPC(GlobalTrackID id) { mRefTPC = id; }
+  void setRefITS(GlobalTrackID id) { mRefITS = id; }
 
   const timeEst& getTimeMUS() const { return mTimeMUS; }
   timeEst& getTimeMUS() { return mTimeMUS; }
@@ -64,14 +65,14 @@ class TrackTPCITS : public o2::track::TrackParCov
   void print() const;
 
  private:
-  int mRefTPC = -1;                  ///< reference on ITS track entry in its original container
-  int mRefITS = -1;                  ///< reference on TPC track entry in its original container
+  GlobalTrackID mRefTPC;             ///< reference on ITS track entry in its original container
+  GlobalTrackID mRefITS;             ///< reference on TPC track entry in its original container
   float mChi2Refit = 0.f;            ///< chi2 of the refit
   float mChi2Match = 0.f;            ///< chi2 of the match
   timeEst mTimeMUS;                  ///< time estimate in ns
   o2::track::TrackParCov mParamOut;  ///< refitted outer parameter
   o2::track::TrackLTIntegral mLTOut; ///< L,TOF integral calculated during the outward refit
-  ClassDefNV(TrackTPCITS, 2);
+  ClassDefNV(TrackTPCITS, 3);
 };
 } // namespace dataformats
 } // namespace o2
diff --git a/DataFormats/Reconstruction/src/ReconstructionDataFormatsLinkDef.h b/DataFormats/Reconstruction/src/ReconstructionDataFormatsLinkDef.h
@@ -47,6 +47,7 @@
 
 #pragma link C++ class o2::dataformats::GlobalTrackID + ;
 #pragma link C++ class std::vector < o2::dataformats::GlobalTrackID> + ;
+#pragma link C++ class o2::dataformats::EvIndex < int, o2::dataformats::GlobalTrackID> + ;
 
 #pragma link C++ class o2::dataformats::VtxTrackIndex + ;
 #pragma link C++ class std::vector < o2::dataformats::VtxTrackIndex> + ;
diff --git a/DataFormats/Reconstruction/src/TrackTPCITS.cxx b/DataFormats/Reconstruction/src/TrackTPCITS.cxx
@@ -16,7 +16,7 @@ using namespace o2::dataformats;
 void TrackTPCITS::print() const
 {
   printf("TPCref: %6d ITSref: %6d\nChi2Refit: %6.2f Chi2Matc: %6.2f Time: %10.4f+-%10.4f mus\n",
-         mRefTPC, mRefITS, getChi2Refit(), getChi2Match(),
+         mRefTPC.getIndex(), mRefITS.getIndex(), getChi2Refit(), getChi2Match(),
          mTimeMUS.getTimeStamp(), mTimeMUS.getTimeStampError());
   printf("Inner param: ");
   o2::track::TrackParCov::print();
diff --git a/DataFormats/common/include/CommonDataFormat/AbstractRef.h b/DataFormats/common/include/CommonDataFormat/AbstractRef.h
@@ -70,8 +70,6 @@ class AbstractRef
 
   Base_t getRaw() const { return mRef; }
 
-  operator Base_t() const { return mRef; }
-
  protected:
   Base_t mRef = 0; // packed reference
 
diff --git a/DataFormats/common/test/testAbstractRefAccessor.cxx b/DataFormats/common/test/testAbstractRefAccessor.cxx
@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(AbstractRefAccess)
     auto gid = vid[i];
     const auto& obj = acc.get(gid);
     int expect = gid.getSource() * 100 + i / GloIdx::NSources;
-    LOG(INFO) << i << " ? " << obj.b << " == " << expect << " for " << gid;
+    LOG(INFO) << i << " ? " << obj.b << " == " << expect << " for " << gid.getRaw();
     BOOST_CHECK(obj.b == expect);
   }
 
diff --git a/Detectors/GlobalTracking/include/GlobalTracking/MatchTOF.h b/Detectors/GlobalTracking/include/GlobalTracking/MatchTOF.h
@@ -24,6 +24,7 @@
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/TrackTPCITS.h"
 #include "ReconstructionDataFormats/MatchInfoTOF.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "DataFormatsTOF/CalibInfoTOF.h"
 #include "CommonDataFormat/EvIndex.h"
 #include "SimulationDataFormat/MCCompLabel.h"
@@ -72,6 +73,7 @@ class MatchTOF
 {
   using Geo = o2::tof::Geo;
   using Cluster = o2::tof::Cluster;
+  using evGIdx = o2::dataformats::EvIndex<int, o2::dataformats::GlobalTrackID>;
   using evIdx = o2::dataformats::EvIndex<int, int>;
   using timeEst = o2::dataformats::TimeStampWithError<float, float>;
   using matchTrack = std::pair<o2::track::TrackParCov, timeEst>;
diff --git a/Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h b/Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h
@@ -30,6 +30,7 @@
 #include "DetectorsBase/Propagator.h"
 #include "ReconstructionDataFormats/Track.h"
 #include "ReconstructionDataFormats/TrackTPCITS.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "MathUtils/Primitive2D.h"
 #include "CommonDataFormat/EvIndex.h"
 #include "CommonDataFormat/InteractionRecord.h"
@@ -551,7 +552,7 @@ class MatchTPCITS
     }
     int rof = tbin > 0 ? tbin * mTPCBin2ITSROFrame : 0;
     // the rof is estimated continuous counter but the actual bins might have gaps (e.g. HB rejects etc)-> use mapping
-    return rof < mITSTrackROFContMapping.size() ? mITSTrackROFContMapping[rof] : mITSTrackROFContMapping.back();
+    return rof < int(mITSTrackROFContMapping.size()) ? mITSTrackROFContMapping[rof] : mITSTrackROFContMapping.back();
   }
 
   ///< convert ITS ROFrame to TPC time bin units // TOREMOVE
diff --git a/Detectors/GlobalTracking/src/MatchTOF.cxx b/Detectors/GlobalTracking/src/MatchTOF.cxx
@@ -40,6 +40,7 @@
 #include "TPCBase/ParameterElectronics.h"
 
 using namespace o2::globaltracking;
+using evGIdx = o2::dataformats::EvIndex<int, o2::dataformats::GlobalTrackID>;
 using evIdx = o2::dataformats::EvIndex<int, int>;
 
 ClassImp(MatchTOF);
@@ -1107,8 +1108,8 @@ void MatchTOF::doMatching(int sec)
           foundCluster = true;
           // set event indexes (to be checked)
           evIdx eventIndexTOFCluster(trefTOF.getEntryInTree(), mTOFClusSectIndexCache[indices[0]][itof]);
-          evIdx eventIndexTracks(mCurrTracksTreeEntry, mTracksSectIndexCache[indices[0]][itrk]);
-          mMatchedTracksPairs.emplace_back(o2::dataformats::MatchInfoTOF(eventIndexTOFCluster, chi2, trkLTInt[iPropagation], eventIndexTracks)); // TODO: check if this is correct!
+          evGIdx eventIndexTracks(mCurrTracksTreeEntry, {uint32_t(mTracksSectIndexCache[indices[0]][itrk]), o2::dataformats::GlobalTrackID::ITSTPC});
+          mMatchedTracksPairs.emplace_back(eventIndexTOFCluster, chi2, trkLTInt[iPropagation], eventIndexTracks); // TODO: check if this is correct!
 
 #ifdef _ALLOW_TOF_DEBUG_
           if (mMCTruthON) {
@@ -1426,8 +1427,8 @@ void MatchTOF::doMatchingForTPC(int sec)
             foundCluster = true;
             // set event indexes (to be checked)
             evIdx eventIndexTOFCluster(trefTOF.getEntryInTree(), mTOFClusSectIndexCache[indices[0]][itof]);
-            evIdx eventIndexTracks(mCurrTracksTreeEntry, mTracksSectIndexCache[indices[0]][itrk]);
-            mMatchedTracksPairs.emplace_back(o2::dataformats::MatchInfoTOF(eventIndexTOFCluster, chi2, trkLTInt[ibc][iPropagation], eventIndexTracks)); // TODO: check if this is correct!
+            evGIdx eventIndexTracks(mCurrTracksTreeEntry, {uint32_t(mTracksSectIndexCache[indices[0]][itrk]), o2::dataformats::GlobalTrackID::TPC});
+            mMatchedTracksPairs.emplace_back(eventIndexTOFCluster, chi2, trkLTInt[ibc][iPropagation], eventIndexTracks); // TODO: check if this is correct!
           }
         }
       }
diff --git a/Detectors/GlobalTracking/src/MatchTPCITS.cxx b/Detectors/GlobalTracking/src/MatchTPCITS.cxx
@@ -1472,8 +1472,8 @@ bool MatchTPCITS::refitTrackTPCITS(int iTPC, int& iITS)
   trfit.setChi2Match(tpcMatchRec.chi2);
   trfit.setChi2Refit(chi2);
   trfit.setTimeMUS(time, timeErr);
-  trfit.setRefTPC(tTPC.sourceID);
-  trfit.setRefITS(tITS.sourceID);
+  trfit.setRefTPC({unsigned(tTPC.sourceID), o2::dataformats::GlobalTrackID::TPC});
+  trfit.setRefITS({unsigned(tITS.sourceID), o2::dataformats::GlobalTrackID::ITS});
 
   if (mMCTruthON) { // store MC info
     mOutITSLabels.emplace_back(mITSLblWork[iITS]);
diff --git a/Detectors/TPC/calibration/SpacePoints/src/TrackInterpolation.cxx b/Detectors/TPC/calibration/SpacePoints/src/TrackInterpolation.cxx
@@ -18,6 +18,7 @@
 #include "TPCBase/ParameterElectronics.h"
 #include "DataFormatsTPC/TrackTPC.h"
 #include "DataFormatsTPC/Defs.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 
 #include <fairlogger/Logger.h>
 #include <set>
diff --git a/Detectors/Vertexing/include/DetectorsVertexing/PVertexer.h b/Detectors/Vertexing/include/DetectorsVertexing/PVertexer.h
@@ -70,7 +70,7 @@ class PVertexer
   }
   float getTukey() const;
 
-  void finalizeVertex(const VertexingInput& input, const PVertex& vtx, std::vector<PVertex>& vertices, std::vector<V2TRef>& v2tRefs, std::vector<int>& vertexTrackIDs, SeedHisto& histo);
+  void finalizeVertex(const VertexingInput& input, const PVertex& vtx, std::vector<PVertex>& vertices, std::vector<V2TRef>& v2tRefs, std::vector<GTrackID>& vertexTrackIDs, SeedHisto& histo);
   bool setCompatibleIR(PVertex& vtx);
 
   void setBunchFilling(const o2::BunchFilling& bf);
@@ -107,7 +107,7 @@ class PVertexer
   void applyConstraint(VertexSeed& vtxSeed) const;
   bool upscaleSigma(VertexSeed& vtxSeed) const;
   void createTracksPool(gsl::span<const o2d::TrackTPCITS> tracksITSTPC);
-  int findVertices(const VertexingInput& input, std::vector<PVertex>& vertices, std::vector<int>& vertexTrackIDs, std::vector<V2TRef>& v2tRefs);
+  int findVertices(const VertexingInput& input, std::vector<PVertex>& vertices, std::vector<GTrackID>& vertexTrackIDs, std::vector<V2TRef>& v2tRefs);
   std::pair<int, int> getBestFT0Trigger(const PVertex& vtx, gsl::span<const o2::ft0::RecPoints> ft0Data, int& currEntry) const;
 
   int dbscan_RangeQuery(int idxs, std::vector<int>& cand, const std::vector<int>& status);
diff --git a/Detectors/Vertexing/include/DetectorsVertexing/PVertexerHelpers.h b/Detectors/Vertexing/include/DetectorsVertexing/PVertexerHelpers.h
@@ -31,6 +31,7 @@ using PVertex = o2::dataformats::PrimaryVertex;
 using TimeEst = o2::dataformats::TimeStampWithError<float, float>;
 using V2TRef = o2::dataformats::VtxTrackRef;
 using GIndex = o2::dataformats::VtxTrackIndex;
+using GTrackID = o2::dataformats::GlobalTrackID;
 
 ///< weights and scaling params for current vertex
 struct VertexSeed : public PVertex {
@@ -96,9 +97,8 @@ struct TrackVF {
 
   TimeEst timeEst;
   float wgh = 0.; ///< track weight wrt current vertex seed
-  uint32_t entry = 0;
+  GTrackID entry;
   int16_t bin = -1; // seeds histo bin
-  uint8_t srcID = 0;
   uint8_t flags = 0;
   int vtxID = kNoVtx; ///< assigned vertex
 
@@ -143,8 +143,8 @@ struct TrackVF {
   }
 
   TrackVF() = default;
-  TrackVF(const o2::track::TrackParCov& src, const TimeEst& t_est, uint32_t _entry, uint8_t _srcID)
-    : x(src.getX()), y(src.getY()), z(src.getZ()), tgL(src.getTgl()), tgP(src.getSnp() / std::sqrt(1. - src.getSnp()) * (1. + src.getSnp())), timeEst(t_est), entry(_entry), srcID(_srcID)
+  TrackVF(const o2::track::TrackParCov& src, const TimeEst& t_est, GTrackID _entry)
+    : x(src.getX()), y(src.getY()), z(src.getZ()), tgL(src.getTgl()), tgP(src.getSnp() / std::sqrt(1. - src.getSnp()) * (1. + src.getSnp())), timeEst(t_est), entry(_entry)
   {
     o2::math_utils::sincos(src.getAlpha(), sinAlp, cosAlp);
     auto det = src.getSigmaY2() * src.getSigmaZ2() - src.getSigmaZY() * src.getSigmaZY();
diff --git a/Detectors/Vertexing/src/PVertexer.cxx b/Detectors/Vertexing/src/PVertexer.cxx
@@ -35,7 +35,7 @@ int PVertexer::process(gsl::span<const o2d::TrackTPCITS> tracksITSTPC, gsl::span
   dbscan_clusterize();
 
   std::vector<PVertex> verticesLoc;
-  std::vector<int> vertexTrackIDsLoc;
+  std::vector<GTrackID> vertexTrackIDsLoc;
   std::vector<V2TRef> v2tRefsLoc;
   std::vector<float> validationTimes;
 
@@ -87,7 +87,7 @@ int PVertexer::process(gsl::span<const o2d::TrackTPCITS> tracksITSTPC, gsl::span
     vertices.push_back(vtx);
     int it = v2tRefsLoc[i].getFirstEntry(), itEnd = it + v2tRefsLoc[i].getEntries(), dest0 = vertexTrackIDs.size();
     for (; it < itEnd; it++) {
-      auto& gid = vertexTrackIDs.emplace_back(vertexTrackIDsLoc[it], GIndex::ITSTPC);
+      auto& gid = vertexTrackIDs.emplace_back(vertexTrackIDsLoc[it]);
       gid.setPVContributor();
     }
     v2tRefs.emplace_back(dest0, v2tRefsLoc[i].getEntries());
@@ -110,7 +110,7 @@ int PVertexer::process(gsl::span<const o2d::TrackTPCITS> tracksITSTPC, gsl::span
 }
 
 //______________________________________________
-int PVertexer::findVertices(const VertexingInput& input, std::vector<PVertex>& vertices, std::vector<int>& vertexTrackIDs, std::vector<V2TRef>& v2tRefs)
+int PVertexer::findVertices(const VertexingInput& input, std::vector<PVertex>& vertices, std::vector<GTrackID>& vertexTrackIDs, std::vector<V2TRef>& v2tRefs)
 {
   // find vertices using tracks with indices (sorted in time) from idRange from "tracks" pool. The pool may containt arbitrary number of tracks,
   // only those which are in the idRange and have canUse()==true, will be used.
@@ -439,7 +439,7 @@ void PVertexer::init()
 
 //___________________________________________________________________
 void PVertexer::finalizeVertex(const VertexingInput& input, const PVertex& vtx,
-                               std::vector<PVertex>& vertices, std::vector<V2TRef>& v2tRefs, std::vector<int>& vertexTrackIDs,
+                               std::vector<PVertex>& vertices, std::vector<V2TRef>& v2tRefs, std::vector<GTrackID>& vertexTrackIDs,
                                SeedHisto& histo)
 {
   int lastID = vertices.size();
@@ -477,7 +477,7 @@ void PVertexer::createTracksPool(gsl::span<const o2d::TrackTPCITS> tracksITSTPC)
         dca.getY() * dca.getY() / (dca.getSigmaY2() + vtxErr2) > mPVParams->pullIniCut) {
       continue;
     }
-    auto& tvf = mTracksPool.emplace_back(trc, tracksITSTPC[i].getTimeMUS(), i, 0);
+    auto& tvf = mTracksPool.emplace_back(trc, tracksITSTPC[i].getTimeMUS(), GTrackID{i, o2::dataformats::GlobalTrackID::ITSTPC});
     mStatZErr.add(std::sqrt(trc.getSigmaZ2()));
     mStatTErr.add(tvf.timeEst.getTimeStampError());
   }
diff --git a/macro/checkTOFMatching.C b/macro/checkTOFMatching.C

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ using namespace o2::dataformats;`
`16`	`16`	`void TrackTPCITS::print() const`
`17`	`17`	`{`
`18`	`18`	`printf("TPCref: %6d ITSref: %6d\nChi2Refit: %6.2f Chi2Matc: %6.2f Time: %10.4f+-%10.4f mus\n",`
`19`		`- mRefTPC, mRefITS, getChi2Refit(), getChi2Match(),`
	`19`	`+ mRefTPC.getIndex(), mRefITS.getIndex(), getChi2Refit(), getChi2Match(),`
`20`	`20`	`mTimeMUS.getTimeStamp(), mTimeMUS.getTimeStampError());`
`21`	`21`	`printf("Inner param: ");`
`22`	`22`	`o2::track::TrackParCov::print();`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(AbstractRefAccess)`
`86`	`86`	`auto gid = vid[i];`
`87`	`87`	`const auto& obj = acc.get(gid);`
`88`	`88`	`int expect = gid.getSource() * 100 + i / GloIdx::NSources;`
`89`		`- LOG(INFO) << i << " ? " << obj.b << " == " << expect << " for " << gid;`
	`89`	`+ LOG(INFO) << i << " ? " << obj.b << " == " << expect << " for " << gid.getRaw();`
`90`	`90`	`BOOST_CHECK(obj.b == expect);`
`91`	`91`	`}`
`92`	`92`