misc fixes in propagator

Author: shahor02

Detectors/Base/include/DetectorsBase/MatCell.h

@@ -56,6 +56,16 @@ struct MatBudget : MatCell {
     length *= scale;
   }
 
+  GPUd() float getXRho() const
+  {
+    return meanRho * length;
+  }
+
+  GPUd() float getXRho(int signCorr) const
+  {
+    return meanRho * (signCorr < 0 ? -length : length);
+  }
+
   ClassDefNV(MatBudget, 1);
 };
 

Detectors/Base/include/DetectorsBase/Propagator.h

@@ -125,7 +125,8 @@ class Propagator
 #endif
 
   GPUd() MatBudget getMatBudget(MatCorrType corrType, const o2::math_utils::Point3D<float>& p0, const o2::math_utils::Point3D<float>& p1) const;
-  GPUd() void getFiedXYZ(const math_utils::Point3D<float> xyz, float* bxyz) const;
+  GPUd() void getFieldXYZ(const math_utils::Point3D<float> xyz, float* bxyz) const;
+  GPUd() void getFieldXYZ(const math_utils::Point3D<double> xyz, double* bxyz) const;
 
  private:
 #ifndef GPUCA_GPUCODE

Detectors/Base/src/Propagator.cxx

@@ -137,7 +137,7 @@ GPUd() bool Propagator::PropagateToXBxByBz(o2::track::TrackParCov& track, float
     }
     auto x = track.getX() + step;
     auto xyz0 = track.getXYZGlo();
-    getFiedXYZ(xyz0, &b[0]);
+    getFieldXYZ(xyz0, &b[0]);
 
     if (!track.propagateTo(x, b)) {
       return false;
@@ -148,7 +148,7 @@ GPUd() bool Propagator::PropagateToXBxByBz(o2::track::TrackParCov& track, float
     if (matCorr != MatCorrType::USEMatCorrNONE) {
       auto xyz1 = track.getXYZGlo();
       auto mb = getMatBudget(matCorr, xyz0, xyz1);
-      if (!track.correctForMaterial(mb.meanX2X0, ((signCorr < 0) ? -mb.length : mb.length) * mb.meanRho)) {
+      if (!track.correctForMaterial(mb.meanX2X0, mb.getXRho(signCorr))) {
         return false;
       }
 
@@ -197,7 +197,7 @@ GPUd() bool Propagator::PropagateToXBxByBz(o2::track::TrackPar& track, float xTo
     }
     auto x = track.getX() + step;
     auto xyz0 = track.getXYZGlo();
-    getFiedXYZ(xyz0, &b[0]);
+    getFieldXYZ(xyz0, &b[0]);
 
     if (!track.propagateParamTo(x, b)) {
       return false;
@@ -266,7 +266,7 @@ GPUd() bool Propagator::propagateToX(o2::track::TrackParCov& track, float xToGo,
       auto xyz1 = track.getXYZGlo();
       auto mb = getMatBudget(matCorr, xyz0, xyz1);
       //
-      if (!track.correctForMaterial(mb.meanX2X0, ((signCorr < 0) ? -mb.length : mb.length) * mb.meanRho)) {
+      if (!track.correctForMaterial(mb.meanX2X0, mb.getXRho(signCorr))) {
         return false;
       }
 
@@ -325,7 +325,7 @@ GPUd() bool Propagator::propagateToX(o2::track::TrackPar& track, float xToGo, fl
       auto xyz1 = track.getXYZGlo();
       auto mb = getMatBudget(matCorr, xyz0, xyz1);
       //
-      if (!track.correctForELoss(((signCorr < 0) ? -mb.length : mb.length) * mb.meanRho)) {
+      if (!track.correctForELoss(mb.getXRho(signCorr))) {
         return false;
       }
 
@@ -533,7 +533,7 @@ GPUd() MatBudget Propagator::getMatBudget(Propagator::MatCorrType corrType, cons
   return mMatLUT->getMatBudget(p0.X(), p0.Y(), p0.Z(), p1.X(), p1.Y(), p1.Z());
 }
 
-GPUd() void Propagator::getFiedXYZ(const math_utils::Point3D<float> xyz, float* bxyz) const
+GPUd() void Propagator::getFieldXYZ(const math_utils::Point3D<float> xyz, float* bxyz) const
 {
   if (mGPUField) {
 #if defined(GPUCA_GPUCODE_DEVICE) && defined(GPUCA_HAS_GLOBAL_SYMBOL_CONSTANT_MEM)
@@ -548,3 +548,23 @@ GPUd() void Propagator::getFiedXYZ(const math_utils::Point3D<float> xyz, float*
 #endif
   }
 }
+
+GPUd() void Propagator::getFieldXYZ(const math_utils::Point3D<double> xyz, double* bxyz) const
+{
+  if (mGPUField) {
+#if defined(GPUCA_GPUCODE_DEVICE) && defined(GPUCA_HAS_GLOBAL_SYMBOL_CONSTANT_MEM)
+    const auto* f = &GPUCA_CONSMEM.param.polynomialField; // Access directly from constant memory on GPU (copied here to avoid complicated header dependencies)
+#else
+    const auto* f = mGPUField;
+#endif
+    float bxyzF[3];
+    f->GetField(xyz.X(), xyz.Y(), xyz.Z(), bxyzF);
+    bxyz[0] = bxyzF[0];
+    bxyz[1] = bxyzF[1];
+    bxyz[2] = bxyzF[2];
+  } else {
+#ifndef GPUCA_GPUCODE
+    mField->Field(xyz, bxyz); // Must not call the host-only function in GPU compilation
+#endif
+  }
+}

Detectors/GlobalTracking/src/MatchTPCITS.cxx

@@ -1450,7 +1450,7 @@ bool MatchTPCITS::refitTrackTPCITS(int iTPC, int& iITS)
     if (mFieldON) { // circular arc = 2*R*asin(dXY/2R)
       float b[3];
       o2::math_utils::Point3D<float> posAv(0.5 * (posEnd.x() + posStart.x()), 0.5 * (posEnd.y() + posStart.y()), 0.5 * (posEnd.z() + posStart.z()));
-      propagator->getFiedXYZ(posAv, b);
+      propagator->getFieldXYZ(posAv, b);
       float curvH = std::abs(0.5f * tracOut.getCurvature(b[2])), arcXY = 1. / curvH * std::asin(curvH * std::sqrt(d2XY));
       d2XY = arcXY * arcXY;
     }