TPC Splines: fixes after rebase

Author: sgorbuno

GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.cxx

@@ -116,11 +116,11 @@ void TPCFastSpaceChargeCorrection::cloneFromObject(const TPCFastSpaceChargeCorre
 
   mClassVersion = obj.mClassVersion;
 
-  for (int i = 0; i < TPCFastTransformGeo::getMaxNumberOfRows(); i++) {
+  for (int32_t i = 0; i < TPCFastTransformGeo::getMaxNumberOfRows(); i++) {
     mRowInfos[i] = obj.mRowInfos[i];
   }
 
-  for (int i = 0; i < TPCFastTransformGeo::getNumberOfSlices() * TPCFastTransformGeo::getMaxNumberOfRows(); i++) {
+  for (int32_t i = 0; i < TPCFastTransformGeo::getNumberOfSlices() * TPCFastTransformGeo::getMaxNumberOfRows(); i++) {
     mSliceRowInfos[i] = obj.mSliceRowInfos[i];
   }
 
@@ -141,7 +141,7 @@ void TPCFastSpaceChargeCorrection::setActualBufferAddress(char* actualFlatBuffer
   /// Sets the actual location of the external flat buffer after it has been moved (e.g. to another maschine)
 
   struct RowInfoVersion3 {
-    int splineScenarioID{0};      ///< scenario index (which of Spline2D splines to use)
+    int32_t splineScenarioID{0};  ///< scenario index (which of Spline2D splines to use)
     size_t dataOffsetBytes[3]{0}; ///< offset for the spline data withing a TPC slice
   };
 
@@ -199,24 +199,24 @@ void TPCFastSpaceChargeCorrection::setActualBufferAddress(char* actualFlatBuffer
   if (mClassVersion == 3) { // copy old-format slicerow data from the buffer to the arrays
 
     auto* rowInfosOld = reinterpret_cast<RowInfoVersion3*>(mFlatBufferPtr + rowsOffset);
-    for (int i = 0; i < mGeo.getNumberOfRows(); i++) {
+    for (int32_t i = 0; i < mGeo.getNumberOfRows(); i++) {
       RowInfoVersion3& infoOld = rowInfosOld[i];
       RowInfo& info = mRowInfos[i];
       info.splineScenarioID = infoOld.splineScenarioID;
-      for (int is = 0; is < 3; is++) {
+      for (int32_t is = 0; is < 3; is++) {
         info.dataOffsetBytes[is] = infoOld.dataOffsetBytes[is];
       }
     }
 
-    for (int is = 0; is < mNumberOfScenarios; is++) {
+    for (int32_t is = 0; is < mNumberOfScenarios; is++) {
       auto& spline = mScenarioPtr[is];
       spline.setXrange(0., spline.getGridX1().getUmax(), 0., spline.getGridX2().getUmax());
     }
 
     auto* sliceRowInfosOld = reinterpret_cast<SliceRowInfoVersion3*>(mFlatBufferPtr + sliceRowsOffset);
 
-    for (int slice = 0; slice < mGeo.getNumberOfSlices(); slice++) {
-      for (int row = 0; row < mGeo.getNumberOfRows(); row++) {
+    for (int32_t slice = 0; slice < mGeo.getNumberOfSlices(); slice++) {
+      for (int32_t row = 0; row < mGeo.getNumberOfRows(); row++) {
         SliceRowInfoVersion3& infoOld = sliceRowInfosOld[mGeo.getNumberOfRows() * slice + row];
         SliceRowInfo& info = getSliceRowInfo(slice, row);
         const auto& spline = getSpline(slice, row);
@@ -236,7 +236,7 @@ void TPCFastSpaceChargeCorrection::setActualBufferAddress(char* actualFlatBuffer
         info.activeArea.cuMin = infoOld.activeArea.cuMin;
         info.activeArea.cuMax = infoOld.activeArea.cuMax;
         info.activeArea.cvMax = infoOld.activeArea.cvMax;
-        for (int i = 0; i < 5; i++) {
+        for (int32_t i = 0; i < 5; i++) {
           info.activeArea.maxDriftLengthCheb[i] = infoOld.activeArea.maxDriftLengthCheb[i];
         }
       }
@@ -256,7 +256,7 @@ void TPCFastSpaceChargeCorrection::setFutureBufferAddress(char* futureFlatBuffer
   char* oldBuffer = mFlatBufferPtr;
   char* newBuffer = futureFlatBufferPtr;
 
-  for (int i = 0; i < mNumberOfScenarios; i++) {
+  for (int32_t i = 0; i < mNumberOfScenarios; i++) {
     SplineType& sp = mScenarioPtr[i];
     char* newSplineBuf = relocatePointer(oldBuffer, newBuffer, sp.getFlatBufferPtr());
     sp.setFutureBufferAddress(newSplineBuf);
@@ -278,7 +278,7 @@ void TPCFastSpaceChargeCorrection::print() const
   LOG(info) << "  mSliceDataSizeBytes = " << mSliceDataSizeBytes[0] << " " << mSliceDataSizeBytes[1] << " " << mSliceDataSizeBytes[2];
   {
     LOG(info) << "  TPC rows: ";
-    for (int i = 0; i < mGeo.getNumberOfRows(); i++) {
+    for (int32_t i = 0; i < mGeo.getNumberOfRows(); i++) {
       const RowInfo& r = mRowInfos[i];
       LOG(info) << " tpc row " << i << ": splineScenarioID = " << r.splineScenarioID << " dataOffsetBytes = " << r.dataOffsetBytes;
     }
@@ -331,7 +331,7 @@ void TPCFastSpaceChargeCorrection::startConstruction(const TPCFastTransformGeo&
 
   assert(mConstructionScenarios != nullptr);
 
-  for (int i = 0; i < mGeo.getNumberOfRows(); i++) {
+  for (int32_t i = 0; i < mGeo.getNumberOfRows(); i++) {
     mRowInfos[i].splineScenarioID = -1;
   }
 
@@ -378,7 +378,7 @@ void TPCFastSpaceChargeCorrection::finishConstruction()
 
   assert(mConstructionMask & ConstructionState::InProgress);
 
-  for (int i = 0; i < mGeo.getNumberOfRows(); i++) {
+  for (int32_t i = 0; i < mGeo.getNumberOfRows(); i++) {
     assert(mRowInfos[i].splineScenarioID >= 0);
   }
   for (int32_t i = 0; i < mNumberOfScenarios; i++) {
@@ -404,7 +404,7 @@ void TPCFastSpaceChargeCorrection::finishConstruction()
   for (int32_t is = 0; is < 3; is++) {
     sliceDataOffset[is] = alignSize(bufferSize, SplineType::getParameterAlignmentBytes());
     mSliceDataSizeBytes[is] = 0;
-    for (int i = 0; i < mGeo.getNumberOfRows(); i++) {
+    for (int32_t i = 0; i < mGeo.getNumberOfRows(); i++) {
       RowInfo& row = mRowInfos[i];
       SplineType& spline = mConstructionScenarios[row.splineScenarioID];
       row.dataOffsetBytes[is] = alignSize(mSliceDataSizeBytes[is], SplineType::getParameterAlignmentBytes());

GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.h

@@ -251,7 +251,7 @@ class TPCFastSpaceChargeCorrection : public FlatObject
   GPUd() float getInterpolationSafetyMargin() const { return fInterpolationSafetyMargin; }
 
   /// Gives TPC row info
-  GPUd() const RowInfo& getRowInfo(int row) const { return mRowInfos[row]; }
+  GPUd() const RowInfo& getRowInfo(int32_t row) const { return mRowInfos[row]; }
 
   /// Gives TPC slice info
   GPUd() const SliceInfo& getSliceInfo(int32_t slice) const
@@ -321,7 +321,7 @@ class TPCFastSpaceChargeCorrection : public FlatObject
   /// Class version. It is used to read older versions from disc.
   /// The default version 3 is the one before this field was introduced.
   /// The actual version must be set in startConstruction().
-  int mClassVersion{3};
+  int32_t mClassVersion{3};
 
   RowInfo mRowInfos[TPCFastTransformGeo::getMaxNumberOfRows()]; ///< RowInfo array
 

GPU/TPCFastTransformation/macro/TPCFastTransformInit.C

@@ -109,10 +109,10 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root",
     }
     std::cout << std::endl;
 
-    int nY2Xbins = trackResiduals.getNY2XBins();
+    int32_t nY2Xbins = trackResiduals.getNY2XBins();
 
     std::cout << " TrackResiduals y2x bins: " << nY2Xbins << std::endl;
-    for (int i = 0; i < nY2Xbins; i++) {
+    for (int32_t i = 0; i < nY2Xbins; i++) {
       std::cout << "scaled getY2X(bin) : " << trackResiduals.getY2X(0, i) / trackResiduals.getMaxY2X(0) << std::endl;
     }
 
@@ -123,9 +123,9 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root",
     }
     std::cout << std::endl;
 
-    int nZ2Xbins = trackResiduals.getNZ2XBins();
+    int32_t nZ2Xbins = trackResiduals.getNZ2XBins();
     std::cout << " TrackResiduals z2x bins: " << nZ2Xbins << std::endl;
-    for (int i = 0; i < nZ2Xbins; i++) {
+    for (int32_t i = 0; i < nZ2Xbins; i++) {
       std::cout << "getZ2X(bin) : " << trackResiduals.getZ2X(i) << std::endl;
     }
     std::cout << " ==================================== " << std::endl;
@@ -168,9 +168,9 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root",
 
       const o2::gpu::TPCFastTransformGeo& geo = helper->getGeometry();
 
-      // for (int iRoc = 0; iRoc < geo.getNumberOfSlices(); iRoc++) {
-      for (int iRoc = 0; iRoc < 1; iRoc++) {
-        for (int iRow = 0; iRow < geo.getNumberOfRows(); iRow++) {
+      // for (int32_t iRoc = 0; iRoc < geo.getNumberOfSlices(); iRoc++) {
+      for (int32_t iRoc = 0; iRoc < 1; iRoc++) {
+        for (int32_t iRow = 0; iRow < geo.getNumberOfRows(); iRow++) {
           auto& info = corr.getSliceRowInfo(iRoc, iRow);
           std::cout << "roc " << iRoc << " row " << iRow
                     << " gridV0 " << info.gridV0 << " gridCorrU0 " << info.gridCorrU0 << " gridCorrV0 " << info.gridCorrV0
@@ -258,8 +258,8 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root",
   branch->SetAddress(&v);
   branch->SetAutoDelete(kTRUE);
 
-  int iRocLast = -1;
-  int iRowLast = -1;
+  int32_t iRocLast = -1;
+  int32_t iRowLast = -1;
 
   for (int32_t iVox = 0; iVox < voxResTree->GetEntriesFast(); iVox++) {
 
@@ -321,7 +321,7 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root",
 
     double d[3] = {cx - correctionX, cy - correctionY, cz - correctionZ};
     if (voxEntries >= 1.) {
-      for (int i = 0; i < 3; i++) {
+      for (int32_t i = 0; i < 3; i++) {
         if (fabs(maxDiff[i]) < fabs(d[i])) {
           maxDiff[i] = d[i];
           maxDiffRoc[i] = iRoc;
@@ -364,7 +364,7 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root",
         std::vector<double> p[2], g[2];
 
         p[0].push_back(geo.getRowInfo(iRow).getUmin());
-        for (int iu = 0; iu < gridU.getNumberOfKnots(); iu++) {
+        for (int32_t iu = 0; iu < gridU.getNumberOfKnots(); iu++) {
           float u, v;
           corr.convGridToUV(iRoc, iRow, gridU.getKnot(iu).getU(), 0., u, v);
           g[0].push_back(u);
@@ -373,30 +373,30 @@ void TPCFastTransformInit(const char* fileName = "debugVoxRes.root",
         p[0].push_back(geo.getRowInfo(iRow).getUmax());
 
         p[1].push_back(0.);
-        for (int iv = 0; iv < gridV.getNumberOfKnots(); iv++) {
+        for (int32_t iv = 0; iv < gridV.getNumberOfKnots(); iv++) {
           float u, v;
           corr.convGridToUV(iRoc, iRow, 0., gridV.getKnot(iv).getU(), u, v);
           g[1].push_back(v);
           p[1].push_back(v);
         }
         p[1].push_back(geo.getTPCzLength(iRoc));
 
-        for (int iuv = 0; iuv < 2; iuv++) {
-          int n = p[iuv].size();
-          for (unsigned int i = 0; i < n - 1; i++) {
+        for (int32_t iuv = 0; iuv < 2; iuv++) {
+          int32_t n = p[iuv].size();
+          for (int32_t i = 0; i < n - 1; i++) {
             double d = (p[iuv][i + 1] - p[iuv][i]) / 10.;
-            for (int ii = 1; ii < 10; ii++) {
+            for (int32_t ii = 1; ii < 10; ii++) {
               p[iuv].push_back(p[iuv][i] + d * ii);
             }
           }
           std::sort(p[iuv].begin(), p[iuv].end());
         }
 
-        for (int iter = 0; iter < 2; iter++) {
+        for (int32_t iter = 0; iter < 2; iter++) {
           std::vector<double>& pu = ((iter == 0) ? g[0] : p[0]);
           std::vector<double>& pv = ((iter == 0) ? g[1] : p[1]);
-          for (unsigned int iu = 0; iu < pu.size(); iu++) {
-            for (unsigned int iv = 0; iv < pv.size(); iv++) {
+          for (uint32_t iu = 0; iu < pu.size(); iu++) {
+            for (uint32_t iv = 0; iv < pv.size(); iv++) {
               float u = pu[iu];
               float v = pv[iv];
               float x, y, z;