TPC Splines: keep old cropping scheme for earlier versions of the correction map

Author: cbmsw

GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.cxx

@@ -113,6 +113,8 @@ void TPCFastSpaceChargeCorrection::cloneFromObject(const TPCFastSpaceChargeCorre
 
   mClassVersion = obj.mClassVersion;
 
+  mIsConvertedFromVersion = obj.mIsConvertedFromVersion;
+
   for (int32_t i = 0; i < TPCFastTransformGeo::getNumberOfSectors() * TPCFastTransformGeo::getMaxNumberOfRows(); i++) {
     mSectorRowInfos[i] = obj.mSectorRowInfos[i];
   }
@@ -285,8 +287,8 @@ void TPCFastSpaceChargeCorrection::setActualBufferAddress(char* actualFlatBuffer
         }
 
         newSectorRow.resetMaxValues();
-        newSectorRow.updateMaxValues(-50.f, -50.f, -50.f);
-        newSectorRow.updateMaxValues(50.f, 50.f, 50.f);
+        newSectorRow.updateMaxValues(-100.f, -100.f, -100.f);
+        newSectorRow.updateMaxValues(100.f, 100.f, 100.f);
       }
     }
   }

GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.h

@@ -338,6 +338,9 @@ class TPCFastSpaceChargeCorrection : public FlatObject
   /// The actual version must be set in startConstruction().
   int32_t mClassVersion{3};
 
+  /// @brief  Version from which the object was converted
+  int32_t mIsConvertedFromVersion{-1}; ///< version from which the object was converted
+
   SectorRowInfo mSectorRowInfos[TPCFastTransformGeo::getNumberOfSectors() * TPCFastTransformGeo::getMaxNumberOfRows()]; ///< SectorRowInfo array
 
   ClassDefNV(TPCFastSpaceChargeCorrection, 4);
@@ -491,9 +494,16 @@ GPUdi() std::array<float, 3> TPCFastSpaceChargeCorrection::getCorrectionLocal(in
   float dxyz[3];
   spline.interpolateAtU(splineData, val[0], val[1], dxyz);
 
+  if (mIsConvertedFromVersion == 3) { // different cropping strategy in version 3
+    if (CAMath::Abs(dxyz[0]) > 100.f || CAMath::Abs(dxyz[1]) > 100.f || CAMath::Abs(dxyz[2]) > 100.f) {
+      val[2] = 0.f;
+    }
+  }
+
   float dx = val[2] * GPUCommonMath::Clamp(dxyz[0], info.minCorr[0], info.maxCorr[0]);
   float dy = val[2] * GPUCommonMath::Clamp(dxyz[1], info.minCorr[1], info.maxCorr[1]);
   float dz = val[2] * GPUCommonMath::Clamp(dxyz[2], info.minCorr[2], info.maxCorr[2]);
+
   return {dx, dy, dz};
 }
 
@@ -503,6 +513,11 @@ GPUdi() float TPCFastSpaceChargeCorrection::getCorrectionXatRealYZ(int32_t secto
   auto val = convRealLocalToGrid(sector, row, realY, realZ);
   float dx = 0;
   getSplineInvX(sector, row).interpolateAtU(getCorrectionDataInvX(sector, row), val[0], val[1], &dx);
+  if (mIsConvertedFromVersion == 3) { // different cropping strategy in version 3
+    if (CAMath::Abs(dx) > 100.f) {
+      val[2] = 0.f;
+    }
+  }
   dx = val[2] * GPUCommonMath::Clamp(dx, info.minCorr[0], info.maxCorr[0]);
   return dx;
 }
@@ -513,6 +528,11 @@ GPUdi() std::array<float, 2> TPCFastSpaceChargeCorrection::getCorrectionYZatReal
   const auto& info = getSectorRowInfo(sector, row);
   float dyz[2];
   getSplineInvYZ(sector, row).interpolateAtU(getCorrectionDataInvYZ(sector, row), val[0], val[1], dyz);
+  if (mIsConvertedFromVersion == 3) { // different cropping strategy in version 3
+    if (CAMath::Abs(dyz[0]) > 100.f || CAMath::Abs(dyz[1]) > 100.f) {
+      val[2] = 0.f;
+    }
+  }
   dyz[0] = val[2] * GPUCommonMath::Clamp(dyz[0], info.minCorr[1], info.maxCorr[1]);
   dyz[1] = val[2] * GPUCommonMath::Clamp(dyz[1], info.minCorr[2], info.maxCorr[2]);
   return {dyz[0], dyz[1]};

GPU/TPCFastTransformation/TPCFastTransformationLinkDef_O2.h

@@ -89,6 +89,9 @@
 #pragma read \
   sourceClass = "o2::gpu::TPCFastSpaceChargeCorrection" targetClass = "o2::gpu::TPCFastSpaceChargeCorrection" source = "float fInterpolationSafetyMargin" version = "[-3]" target = "" code = "{}";
 
+#pragma read \
+  sourceClass = "o2::gpu::TPCFastSpaceChargeCorrection" targetClass = "o2::gpu::TPCFastSpaceChargeCorrection" source = "" version = "[-3]" target = "mIsConvertedFromVersion" code = "{ mIsConvertedFromVersion = 3; }";
+
 #pragma link C++ class o2::gpu::CorrectionMapsHelper + ;
 #pragma link C++ struct o2::gpu::MultivariatePolynomialContainer + ;
 #pragma link C++ struct o2::gpu::NDPiecewisePolynomialContainer + ;