Make sure TOF residuals evaluated in the nominal sector frame

Author: shahor02

Detectors/TPC/calibration/SpacePoints/src/TrackInterpolation.cxx

@@ -512,10 +512,13 @@ void TrackInterpolation::interpolateTrack(int iSeed)
       LOG(debug) << "Failed to rotate into TOF cluster sector frame";
       return;
     }
-    float clTOFX = clTOF.getX();
-    std::array<float, 2> clTOFYZ{clTOF.getY(), clTOF.getZ()};
+    float clTOFxyz[3] = {clTOF.getX(), clTOF.getY(), clTOF.getZ()};
+    if (!clTOF.isInNominalSector()) {
+      o2::tof::Geo::alignedToNominalSector(clTOFxyz, clTOFSec); // go from the aligned to nominal sector frame
+    }
+    std::array<float, 2> clTOFYZ{clTOFxyz[1], clTOFxyz[2]};
     std::array<float, 3> clTOFCov{mParams->sigYZ2TOF, 0.f, mParams->sigYZ2TOF}; // assume no correlation between y and z and equal cluster error sigma^2 = (3cm)^2 / 12
-    if (!propagator->PropagateToXBxByBz(trkWork, clTOFX, mParams->maxSnp, mParams->maxStep, mMatCorr)) {
+    if (!propagator->PropagateToXBxByBz(trkWork, clTOFxyz[0], mParams->maxSnp, mParams->maxStep, mMatCorr)) {
       LOG(debug) << "Failed final propagation to TOF radius";
       return;
     }
@@ -676,20 +679,24 @@ void TrackInterpolation::interpolateTrack(int iSeed)
       // do we have TOF residual to add?
       while (gidTable[GTrackID::TOF].isIndexSet() && !stopPropagation) {
         const auto& clTOF = mRecoCont->getTOFClusters()[gidTable[GTrackID::TOF]];
+        float clTOFxyz[3] = {clTOF.getX(), clTOF.getY(), clTOF.getZ()};
+        if (!clTOF.isInNominalSector()) {
+          o2::tof::Geo::alignedToNominalSector(clTOFxyz, clTOF.getCount()); // go from the aligned to nominal sector frame
+        }
         const float clTOFAlpha = o2::math_utils::sector2Angle(clTOF.getCount());
         if (trkWork.getAlpha() != clTOFAlpha && !trkWork.rotate(clTOFAlpha)) {
           LOG(debug) << "Failed to rotate into TOF cluster sector frame";
           stopPropagation = true;
           break;
         }
-        if (!propagator->PropagateToXBxByBz(trkWork, clTOF.getX(), mParams->maxSnp, mParams->maxStep, mMatCorr)) {
+        if (!propagator->PropagateToXBxByBz(trkWork, clTOFxyz[0], mParams->maxSnp, mParams->maxStep, mMatCorr)) {
           LOG(debug) << "Failed final propagation to TOF radius";
           break;
         }
 
         float tgPhi = trkWork.getSnp() / std::sqrt((1.f - trkWork.getSnp()) * (1.f + trkWork.getSnp()));
-        auto dy = clTOF.getY() - trkWork.getY();
-        auto dz = clTOF.getZ() - trkWork.getZ();
+        auto dy = clTOFxyz[1] - trkWork.getY();
+        auto dz = clTOFxyz[2] - trkWork.getZ();
         if ((std::abs(dy) < param::MaxResid) && (std::abs(dz) < param::MaxResid) && (std::abs(trkWork.getY()) < param::MaxY) && (std::abs(trkWork.getZ()) < param::MaxZ) && (std::abs(tgPhi) < param::MaxTgSlp)) {
           mClRes.emplace_back(dy, dz, tgPhi, trkWork.getY(), trkWork.getZ(), 170, clTOF.getCount(), clTOF.getPadInSector());
           trackData.nExtDetResid++;
@@ -929,19 +936,23 @@ void TrackInterpolation::extrapolateTrack(int iSeed)
       while (gidTableFull[GTrackID::TOF].isIndexSet() && !stopPropagation) {
         const auto& clTOF = mRecoCont->getTOFClusters()[gidTableFull[GTrackID::TOF]];
         const float clTOFAlpha = o2::math_utils::sector2Angle(clTOF.getCount());
+        float clTOFxyz[3] = {clTOF.getX(), clTOF.getY(), clTOF.getZ()};
+        if (!clTOF.isInNominalSector()) {
+          o2::tof::Geo::alignedToNominalSector(clTOFxyz, clTOF.getCount()); // go from the aligned to nominal sector frame
+        }
         if (trkWork.getAlpha() != clTOFAlpha && !trkWork.rotate(clTOFAlpha)) {
           LOG(debug) << "Failed to rotate into TOF cluster sector frame";
           stopPropagation = true;
           break;
         }
-        if (!propagator->PropagateToXBxByBz(trkWork, clTOF.getX(), mParams->maxSnp, mParams->maxStep, mMatCorr)) {
+        if (!propagator->PropagateToXBxByBz(trkWork, clTOFxyz[0], mParams->maxSnp, mParams->maxStep, mMatCorr)) {
           LOG(debug) << "Failed final propagation to TOF radius";
           break;
         }
 
         float tgPhi = trkWork.getSnp() / std::sqrt((1.f - trkWork.getSnp()) * (1.f + trkWork.getSnp()));
-        auto dy = clTOF.getY() - trkWork.getY();
-        auto dz = clTOF.getZ() - trkWork.getZ();
+        auto dy = clTOFxyz[1] - trkWork.getY();
+        auto dz = clTOFxyz[2] - trkWork.getZ();
         if ((std::abs(dy) < param::MaxResid) && (std::abs(dz) < param::MaxResid) && (std::abs(trkWork.getY()) < param::MaxY) && (std::abs(trkWork.getZ()) < param::MaxZ) && (std::abs(tgPhi) < param::MaxTgSlp)) {
           mClRes.emplace_back(dy, dz, tgPhi, trkWork.getY(), trkWork.getZ(), 170, clTOF.getCount(), clTOF.getPadInSector());
           trackData.clAvailTOF = 1;