Add outer param to TPC-ITS match (not functional yet)

Author: shahor02

DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackTPCITS.h

@@ -34,6 +34,7 @@ class TrackTPCITS : public o2::track::TrackParCov
   ~TrackTPCITS() = default;
   TrackTPCITS(const TrackTPCITS& src) = default;
   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) {}
 
   const evIdx& getRefTPC() const { return mRefTPC; }
   const evIdx& getRefITS() const { return mRefITS; }
@@ -57,6 +58,9 @@ class TrackTPCITS : public o2::track::TrackParCov
   void setChi2Match(float v) { mChi2Match = v; }
   float getChi2Match() const { return mChi2Match; }
 
+  o2::track::TrackParCov& getParamOut() { return mParamOut; }
+  const o2::track::TrackParCov& getParamOut() const { return mParamOut; }
+
   void print() const;
 
  private:
@@ -65,8 +69,8 @@ class TrackTPCITS : public o2::track::TrackParCov
   float mChi2Refit = 0.f; ///< chi2 of the refit
   float mChi2Match = 0.f; ///< chi2 of the match
   timeEst mTimeMUS;       ///< time estimate in ns
-
-  ClassDefNV(TrackTPCITS, 1);
+  o2::track::TrackParCov mParamOut; ///< refitted outer parameter
+  ClassDefNV(TrackTPCITS, 2);
 };
 }
 }

DataFormats/Reconstruction/src/TrackTPCITS.cxx

@@ -18,5 +18,8 @@ void TrackTPCITS::print() const
   printf("TPCref: %5d/%6d ITSref: %5d/%6d\nChi2Refit: %6.2f Chi2Matc: %6.2f Time: %10.4f+-%10.4f mus\n",
          mRefTPC.getEvent(), mRefTPC.getIndex(), mRefITS.getEvent(), mRefITS.getIndex(), getChi2Refit(), getChi2Match(),
          mTimeMUS.getTimeStamp(), mTimeMUS.getTimeStampError());
+  printf("Inner param: ");
   o2::track::TrackParCov::print();
+  printf("Outer param: ");
+  mParamOut.print();
 }

Detectors/GlobalTracking/src/MatchTPCITS.cxx

@@ -1119,16 +1119,19 @@ bool MatchTPCITS::refitTrackITSTPC(int iITS)
   loadITSTracksChunk(tITS.source.getEvent());
   loadTPCTracksChunk(tTPC.source.getEvent());
 
-  mMatchedTracks.emplace_back(tTPC); // create a copy of TPC track at xRef
+  auto itsTrOrig = (*mITSTracksArrayInp)[tITS.source.getIndex()]; // currently we store clusterIDs in the track
+
+  mMatchedTracks.emplace_back(tTPC, itsTrOrig.getParamOut()); // create a copy of TPC track at xRef
   auto& trfit = mMatchedTracks.back();
   // in continuos mode the Z of TPC track is meaningless, unless it is CE crossing
   // track (currently absent, TODO)
   if (!mCompareTracksDZ) {
     trfit.setZ(tITS.getZ()); // fix the seed Z
   }
-  float deltaT = (trfit.getZ() - tTPC.getZ()) * mZ2TPCBin; // time correction in time-bins
+  auto dzCorr = trfit.getZ() - tTPC.getZ();
+  float deltaT = dzCorr * mZ2TPCBin; // time correction in time-bins
 
-  auto itsTrOrig = (*mITSTracksArrayInp)[tITS.source.getIndex()]; // currently we store clusterIDs in the track
+  // refit TPC track inward into the ITS
   int nclRefit = 0, ncl = itsTrOrig.getNumberOfClusters();
   float chi2 = 0.f;
   auto geom = o2::ITS::GeometryTGeo::Instance();
@@ -1156,6 +1159,9 @@ bool MatchTPCITS::refitTrackITSTPC(int iITS)
     return false;
   }
 
+  // refit ITS outer trackparam outward into the TPC
+  // TODO
+
   /// precise time estimate
   auto tpcTrOrig = (*mTPCTracksArrayInp)[tTPC.source.getIndex()];
   float time = tpcTrOrig.getTime0() - mNTPCBinsFullDrift;