Find voxel bin for TPC cluster position, not track interpolation position

martenole · martenole · commit 9265d8ac02be · 2023-01-25T16:02:45.000+01:00
diff --git a/Detectors/GlobalTrackingWorkflow/tpcinterpolationworkflow/src/TPCResidualReaderSpec.cxx b/Detectors/GlobalTrackingWorkflow/tpcinterpolationworkflow/src/TPCResidualReaderSpec.cxx
@@ -194,8 +194,8 @@ void TPCResidualReader::run(ProcessingContext& pc)
             auto& statVecOut = mVoxStatsSector[sec];
             std::array<unsigned char, TrackResiduals::VoxDim> bvox;
             float xPos = param::RowX[residIn.row];
-            float yPos = residIn.y * param::MaxY / 0x7fff;
-            float zPos = residIn.z * param::MaxZ / 0x7fff;
+            float yPos = residIn.y * param::MaxY / 0x7fff + residIn.dy * param::MaxResid / 0x7fff;
+            float zPos = residIn.z * param::MaxZ / 0x7fff + residIn.dz * param::MaxResid / 0x7fff;
             if (!mTrackResiduals.findVoxelBin(sec, xPos, yPos, zPos, bvox)) {
               // we are not inside any voxel
               LOGF(debug, "Dropping residual in sec(%i), x(%f), y(%f), z(%f)", sec, xPos, yPos, zPos);
diff --git a/Detectors/TPC/calibration/SpacePoints/macro/staticMapCreator.C b/Detectors/TPC/calibration/SpacePoints/macro/staticMapCreator.C
@@ -254,8 +254,8 @@ void staticMapCreator(std::string fileInput = "files.txt",
           auto& statVecOut = voxStatsSec[sec];
           std::array<unsigned char, TrackResiduals::VoxDim> bvox;
           float xPos = param::RowX[residIn.row];
-          float yPos = residIn.y * param::MaxY / 0x7fff;
-          float zPos = residIn.z * param::MaxZ / 0x7fff;
+          float yPos = residIn.y * param::MaxY / 0x7fff + residIn.dy * param::MaxResid / 0x7fff;
+          float zPos = residIn.z * param::MaxZ / 0x7fff + residIn.dz * param::MaxResid / 0x7fff;
           if (!trackResiduals.findVoxelBin(sec, xPos, yPos, zPos, bvox)) {
             // we are not inside any voxel
             LOGF(debug, "Dropping residual in sec(%i), x(%f), y(%f), z(%f)", sec, xPos, yPos, zPos);
diff --git a/Detectors/TPC/calibration/SpacePoints/src/ResidualAggregator.cxx b/Detectors/TPC/calibration/SpacePoints/src/ResidualAggregator.cxx
@@ -175,8 +175,8 @@ void ResidualsContainer::fill(const o2::dataformats::TFIDInfo& ti, const gsl::sp
     auto& statVecOut = stats[sec];
     std::array<unsigned char, TrackResiduals::VoxDim> bvox;
     float xPos = param::RowX[residIn.row];
-    float yPos = residIn.y * param::MaxY / 0x7fff;
-    float zPos = residIn.z * param::MaxZ / 0x7fff;
+    float yPos = residIn.y * param::MaxY / 0x7fff + residIn.dy * param::MaxResid / 0x7fff;
+    float zPos = residIn.z * param::MaxZ / 0x7fff + residIn.dz * param::MaxResid / 0x7fff;
     if (!trackResiduals->findVoxelBin(sec, xPos, yPos, zPos, bvox)) {
       // we are not inside any voxel
       LOGF(debug, "Dropping residual in sec(%i), x(%f), y(%f), z(%f)", sec, xPos, yPos, zPos);
