GPUTRDRecoParam initialization, use in GPUTRDTracker

TODO passing initialized param to GPUConstantMem

Author: shahor02

Detectors/Align/src/AlignableDetectorTRD.cxx

@@ -26,6 +26,7 @@
 #include "DataFormatsTRD/TrackTRD.h"
 #include "DataFormatsTRD/Tracklet64.h"
 #include "DataFormatsTRD/CalibratedTracklet.h"
+#include "GPUO2InterfaceConfiguration.h"
 #include <TMath.h>
 #include <TGeoManager.h>
 
@@ -175,10 +176,12 @@ int AlignableDetectorTRD::processPoints(GIndex gid, int npntCut, bool inv)
     return -1;
   }
   auto propagator = o2::base::Propagator::Instance(); // float version!
-  static float prevBz = -99999.;
-  if (prevBz != propagator->getNominalBz()) {
-    prevBz = propagator->getNominalBz();
-    mRecoParam.setBfield(prevBz);
+  static bool firstCall = true;
+  if (firstCall) {
+    o2::gpu::GPUO2InterfaceConfiguration config;
+    config.ReadConfigurableParam(config);
+    mRecoParam.init(propagator->getNominalBz(), &config.configReconstruction);
+    firstCall = false;
   }
   const auto* transformer = mController->getTRDTransformer();
   auto algTrack = mController->getAlgTrack();

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

@@ -126,7 +126,9 @@ void TrackInterpolation::init(o2::dataformats::GlobalTrackID::mask_t src, o2::da
   mFastTransform = std::move(TPCFastTransformHelperO2::instance()->create(0));
 
   mBz = o2::base::Propagator::Instance()->getNominalBz();
-  mRecoParam.setBfield(mBz);
+  o2::gpu::GPUO2InterfaceConfiguration config;
+  config.ReadConfigurableParam(config);
+  mRecoParam.init(mBz, &config.configReconstruction);
   mGeoTRD = o2::trd::Geometry::instance();
   mParams = &SpacePointsCalibConfParam::Instance();
 

Detectors/TRD/calibration/src/TrackBasedCalib.cxx

@@ -13,6 +13,7 @@
 /// \brief Provides information required for TRD calibration which is based on the global tracking
 /// \author Ole Schmidt
 
+#include "GPUO2InterfaceConfiguration.h"
 #include "TRDCalibration/TrackBasedCalib.h"
 #include "TRDCalibration/CalibrationParams.h"
 #include "DataFormatsTRD/Constants.h"
@@ -35,7 +36,9 @@ void TrackBasedCalib::reset()
 void TrackBasedCalib::init()
 {
   bz = o2::base::Propagator::Instance()->getNominalBz();
-  mRecoParam.setBfield(bz);
+  o2::gpu::GPUO2InterfaceConfiguration config;
+  config.ReadConfigurableParam(config);
+  mRecoParam.init(bz, &config.configReconstruction);
 }
 
 void TrackBasedCalib::setInput(const o2::globaltracking::RecoContainer& input)

Detectors/TRD/qc/src/Tracking.cxx

@@ -13,6 +13,7 @@
 /// \brief Check the performance of the TRD in global tracking
 /// \author Ole Schmidt
 
+#include "GPUO2InterfaceConfiguration.h"
 #include "TRDQC/Tracking.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
 #include "DetectorsBase/GeometryManager.h"
@@ -25,7 +26,9 @@ using namespace o2::trd::constants;
 
 void Tracking::init()
 {
-  mRecoParam.setBfield(o2::base::Propagator::Instance()->getNominalBz());
+  o2::gpu::GPUO2InterfaceConfiguration config;
+  config.ReadConfigurableParam(config);
+  mRecoParam.init(o2::base::Propagator::Instance()->getNominalBz(), &config.configReconstruction);
 }
 
 void Tracking::setInput(const o2::globaltracking::RecoContainer& input)

Detectors/TRD/workflow/src/TRDGlobalTrackingSpec.cxx

@@ -112,6 +112,8 @@ void TRDGlobalTracking::updateTimeDependentParams(ProcessingContext& pc)
     config.ReadConfigurableParam(config);
     config.configGRP.solenoidBzNominalGPU = GPUO2InterfaceUtils::getNominalGPUBz(*o2::base::GRPGeomHelper::instance().getGRPMagField());
     config.configProcessing.o2PropagatorUseGPUField = false;
+    mRecoParam.init(o2::base::Propagator::Instance()->getNominalBz(), &config.configReconstruction);
+
     mRec->SetSettings(&config.configGRP, &config.configReconstruction, &config.configProcessing, &cfgRecoStep);
 
     mChainTracking = mRec->AddChain<GPUChainTracking>();
@@ -131,8 +133,6 @@ void TRDGlobalTracking::updateTimeDependentParams(ProcessingContext& pc)
       LOG(fatal) << "GPUReconstruction could not be initialized";
     }
 
-    mRecoParam.setBfield(o2::base::Propagator::Instance()->getNominalBz());
-
     mTracker->PrintSettings();
     LOG(info) << "Strict matching mode is " << ((mStrict) ? "ON" : "OFF");
     LOGF(info, "The search road in time for ITS-TPC tracks is set to %.1f sigma and %.2f us are added to it on top",

GPU/GPUTracking/Base/GPUConstantMem.h

@@ -22,6 +22,7 @@
 
 #include "GPUTPCGMMerger.h"
 #include "GPUTRDTracker.h"
+#include "GPUTRDRecoParam.h"
 
 #include "GPUTPCCompression.h"
 #include "GPUTPCDecompression.h"
@@ -57,7 +58,7 @@ struct GPUConstantMem {
 #ifdef GPUCA_HAS_ONNX
   GPUTPCNNClusterizer tpcNNClusterer[GPUCA_NSECTORS];
 #endif
-
+  GPUTRDRecoParam trdRecoParam;
   template <int32_t I>
   GPUd() auto& getTRDTracker();
 };

GPU/GPUTracking/DataTypes/GPUTRDRecoParam.cxx

@@ -13,18 +13,20 @@
 /// \brief Error parameterizations and helper functions for TRD reconstruction
 /// \author Ole Schmidt
 
+#include "GPUSettings.h"
 #include "GPUTRDRecoParam.h"
 #include "GPUCommonLogger.h"
 
 using namespace o2::gpu;
 
 // error parameterizations taken from http://cds.cern.ch/record/2724259 Appendix A
-void GPUTRDRecoParam::setBfield(float bz)
+void GPUTRDRecoParam::init(float bz, const GPUSettingsRec* rec)
 {
+  float resRPhiIdeal2 = rec ? rec->trd.trkltResRPhiIdeal * rec->trd.trkltResRPhiIdeal : 1.6e-3f;
   if (std::fabs(std::fabs(bz) - 2) < 0.1) {
     if (bz > 0) {
       // magnetic field +0.2 T
-      mRPhiA2 = 1.6e-3f;
+      mRPhiA2 = resRPhiIdeal2;
       mRPhiB = -1.43e-2f;
       mRPhiC2 = 4.55e-2f;
 
@@ -37,7 +39,7 @@ void GPUTRDRecoParam::setBfield(float bz)
       mAngleToDyC = -0.4f;
     } else {
       // magnetic field -0.2 T
-      mRPhiA2 = 1.6e-3f;
+      mRPhiA2 = resRPhiIdeal2;
       mRPhiB = 1.43e-2f;
       mRPhiC2 = 4.55e-2f;
 
@@ -52,7 +54,7 @@ void GPUTRDRecoParam::setBfield(float bz)
   } else if (std::fabs(std::fabs(bz) - 5) < 0.1) {
     if (bz > 0) {
       // magnetic field +0.5 T
-      mRPhiA2 = 1.6e-3f;
+      mRPhiA2 = resRPhiIdeal2;
       mRPhiB = 0.125f;
       mRPhiC2 = 0.0961f;
 
@@ -65,7 +67,7 @@ void GPUTRDRecoParam::setBfield(float bz)
       mAngleToDyC = -0.58f;
     } else {
       // magnetic field -0.5 T
-      mRPhiA2 = 1.6e-3f;
+      mRPhiA2 = resRPhiIdeal2;
       mRPhiB = -0.14f;
       mRPhiC2 = 0.1156f;
 

GPU/GPUTracking/DataTypes/GPUTRDRecoParam.h

@@ -26,6 +26,7 @@ namespace o2
 {
 namespace gpu
 {
+struct GPUSettingsRec;
 
 class GPUTRDRecoParam
 {
@@ -35,7 +36,7 @@ class GPUTRDRecoParam
   ~GPUTRDRecoParam() = default;
 
   /// Load parameterization for given magnetic field
-  void setBfield(float bz);
+  void init(float bz, const GPUSettingsRec* rec = nullptr);
 
 #if !defined(GPUCA_GPUCODE_DEVICE)
   /// Recalculate tracklet covariance based on phi angle of related track

GPU/GPUTracking/TRDTracking/GPUTRDTracker.cxx

@@ -92,7 +92,7 @@ void* GPUTRDTracker_t<TRDTRK, PROP>::SetPointersTracks(void* base)
 }
 
 template <class TRDTRK, class PROP>
-GPUTRDTracker_t<TRDTRK, PROP>::GPUTRDTracker_t() : mR(nullptr), mIsInitialized(false), mGenerateSpacePoints(false), mProcessPerTimeFrame(false), mNAngleHistogramBins(25), mAngleHistogramRange(50), mMemoryPermanent(-1), mMemoryTracklets(-1), mMemoryTracks(-1), mNMaxCollisions(0), mNMaxTracks(0), mNMaxSpacePoints(0), mTracks(nullptr), mTrackAttribs(nullptr), mNCandidates(1), mNTracks(0), mNEvents(0), mMaxBackendThreads(100), mTrackletIndexArray(nullptr), mHypothesis(nullptr), mCandidates(nullptr), mSpacePoints(nullptr), mGeo(nullptr), mRPhiA2(0), mRPhiB(0), mRPhiC2(0), mDyA2(0), mDyB(0), mDyC2(0), mAngleToDyA(0), mAngleToDyB(0), mAngleToDyC(0), mDebugOutput(false), mMaxEta(0.84f), mRoadZ(18.f), mZCorrCoefNRC(1.4f), mTPCVdrift(2.58f), mTPCTDriftOffset(0.f), mDebug(new GPUTRDTrackerDebug<TRDTRK>())
+GPUTRDTracker_t<TRDTRK, PROP>::GPUTRDTracker_t() : mR(nullptr), mIsInitialized(false), mGenerateSpacePoints(false), mProcessPerTimeFrame(false), mNAngleHistogramBins(25), mAngleHistogramRange(50), mMemoryPermanent(-1), mMemoryTracklets(-1), mMemoryTracks(-1), mNMaxCollisions(0), mNMaxTracks(0), mNMaxSpacePoints(0), mTracks(nullptr), mTrackAttribs(nullptr), mNCandidates(1), mNTracks(0), mNEvents(0), mMaxBackendThreads(100), mTrackletIndexArray(nullptr), mHypothesis(nullptr), mCandidates(nullptr), mSpacePoints(nullptr), mGeo(nullptr), mRecoParam(nullptr), mDebugOutput(false), mMaxEta(0.84f), mRoadZ(18.f), mZCorrCoefNRC(1.4f), mTPCVdrift(2.58f), mTPCTDriftOffset(0.f), mDebug(new GPUTRDTrackerDebug<TRDTRK>())
 {
   //--------------------------------------------------------------------
   // Default constructor
@@ -114,9 +114,8 @@ void GPUTRDTracker_t<TRDTRK, PROP>::InitializeProcessor()
   //--------------------------------------------------------------------
   // Initialise tracker
   //--------------------------------------------------------------------
-
+  mRecoParam = &GetConstantMem()->trdRecoParam;
   UpdateGeometry();
-
   mDebug->ExpandVectors();
   mIsInitialized = true;
 }
@@ -131,42 +130,6 @@ void GPUTRDTracker_t<TRDTRK, PROP>::UpdateGeometry()
   if (!mGeo) {
     GPUFatal("TRD geometry must be provided externally");
   }
-  float Bz = Param().bzkG;
-  float resRPhiIdeal2 = Param().rec.trd.trkltResRPhiIdeal * Param().rec.trd.trkltResRPhiIdeal;
-  GPUInfo("Initializing with B-field: %f kG", Bz);
-  if (CAMath::Abs(CAMath::Abs(Bz) - 2) < 0.1f) {
-    // magnetic field +-0.2 T
-    if (Bz > 0) {
-      GPUInfo("Loading error parameterization for Bz = +2 kG");
-      mRPhiA2 = resRPhiIdeal2, mRPhiB = -1.43e-2f, mRPhiC2 = 4.55e-2f;
-      mDyA2 = 1.225e-3f, mDyB = -9.8e-3f, mDyC2 = 3.88e-2f;
-      mAngleToDyA = -0.1f, mAngleToDyB = 1.89f, mAngleToDyC = -0.4f;
-    } else {
-      GPUInfo("Loading error parameterization for Bz = -2 kG");
-      mRPhiA2 = resRPhiIdeal2, mRPhiB = 1.43e-2f, mRPhiC2 = 4.55e-2f;
-      mDyA2 = 1.225e-3f, mDyB = 9.8e-3f, mDyC2 = 3.88e-2f;
-      mAngleToDyA = 0.1f, mAngleToDyB = 1.89f, mAngleToDyC = 0.4f;
-    }
-  } else if (CAMath::Abs(CAMath::Abs(Bz) - 5) < 0.1f) {
-    // magnetic field +-0.5 T
-    if (Bz > 0) {
-      GPUInfo("Loading error parameterization for Bz = +5 kG");
-      mRPhiA2 = resRPhiIdeal2, mRPhiB = 0.125f, mRPhiC2 = 0.0961f;
-      mDyA2 = 1.681e-3f, mDyB = 0.15f, mDyC2 = 0.1849f;
-      mAngleToDyA = 0.13f, mAngleToDyB = 2.43f, mAngleToDyC = -0.58f;
-    } else {
-      GPUInfo("Loading error parameterization for Bz = -5 kG");
-      mRPhiA2 = resRPhiIdeal2, mRPhiB = -0.14f, mRPhiC2 = 0.1156f;
-      mDyA2 = 2.209e-3f, mDyB = -0.15f, mDyC2 = 0.2025f;
-      mAngleToDyA = -0.15f, mAngleToDyB = 2.34f, mAngleToDyC = 0.56f;
-    }
-  } else {
-    // magnetic field 0 T or another value which is not covered by the error parameterizations
-    // using default values instead
-    GPUWarning("No error parameterization available for Bz = %.2f kG. Keeping default value (sigma_y = const. = 1cm)", Bz);
-    mRPhiA2 = 1.f;
-  }
-
   // obtain average radius of TRD chambers
   float x0[kNLayers] = {300.2f, 312.8f, 325.4f, 338.0f, 350.6f, 363.2f}; // used as default value in case no transformation matrix can be obtained
   auto* matrix = mGeo->GetClusterMatrix(0);
@@ -967,7 +930,7 @@ GPUd() void GPUTRDTracker_t<TRDTRK, PROP>::RecalcTrkltCov(const float tilt, cons
   //--------------------------------------------------------------------
   float t2 = tilt * tilt;      // tan^2 (tilt)
   float c2 = 1.f / (1.f + t2); // cos^2 (tilt)
-  float sy2 = GetRPhiRes(snp);
+  float sy2 = mRecoParam->getRPhiRes(snp);
   float sz2 = rowSize * rowSize / 12.f;
   cov[0] = c2 * (sy2 + t2 * sz2);
   cov[1] = c2 * tilt * (sz2 - sy2);
@@ -977,8 +940,8 @@ GPUd() void GPUTRDTracker_t<TRDTRK, PROP>::RecalcTrkltCov(const float tilt, cons
 template <class TRDTRK, class PROP>
 GPUd() float GPUTRDTracker_t<TRDTRK, PROP>::GetAngularPull(float dYtracklet, float snp) const
 {
-  float dYtrack = ConvertAngleToDy(snp);
-  float dYresolution = GetAngularResolution(snp);
+  float dYtrack = mRecoParam->convertAngleToDy(snp);
+  float dYresolution = mRecoParam->getDyRes(snp);
   if (dYresolution < 1e-6f) {
     return 999.f;
   }

GPU/GPUTracking/TRDTracking/GPUTRDTracker.h

@@ -23,6 +23,7 @@
 #include "GPUDef.h"
 #include "GPUTRDTrack.h"
 #include "GPUTRDSpacePoint.h"
+#include "GPUTRDRecoParam.h"
 #include "GPULogging.h"
 #include "GPUTRDInterfaces.h"
 
@@ -114,9 +115,6 @@ class GPUTRDTracker_t : public GPUProcessor
   GPUd() bool AdjustSector(PROP* prop, TRDTRK* t) const;
   GPUd() int32_t GetSector(float alpha) const;
   GPUd() float GetAlphaOfSector(const int32_t sec) const;
-  GPUd() float GetRPhiRes(float snp) const { return (mRPhiA2 + mRPhiC2 * (snp - mRPhiB) * (snp - mRPhiB)); }           // parametrization obtained from track-tracklet residuals:
-  GPUd() float GetAngularResolution(float snp) const { return mDyA2 + mDyC2 * (snp - mDyB) * (snp - mDyB); }           // a^2 + c^2 * (snp - b)^2
-  GPUd() float ConvertAngleToDy(float snp) const { return mAngleToDyA + mAngleToDyB * snp + mAngleToDyC * snp * snp; } // a + b*snp + c*snp^2 is more accurate than sin(phi) = (dy / xDrift) / sqrt(1+(dy/xDrift)^2)
   GPUd() float GetAngularPull(float dYtracklet, float snp) const;
   GPUd() void RecalcTrkltCov(const float tilt, const float snp, const float rowSize, float (&cov)[3]);
   GPUd() void FindChambersInRoad(const TRDTRK* t, const float roadY, const float roadZ, const int32_t iLayer, int32_t* det, const float zMax, const float alpha, const float zShiftTrk) const;
@@ -174,16 +172,7 @@ class GPUTRDTracker_t : public GPUProcessor
   TRDTRK* mCandidates;            // array of tracks for multiple hypothesis tracking
   GPUTRDSpacePoint* mSpacePoints; // array with tracklet coordinates in global tracking frame
   const GPUTRDGeometry* mGeo;     // TRD geometry
-  /// ---- error parametrization depending on magnetic field ----
-  float mRPhiA2;     // parameterization for tracklet position resolution
-  float mRPhiB;      // parameterization for tracklet position resolution
-  float mRPhiC2;     // parameterization for tracklet position resolution
-  float mDyA2;       // parameterization for tracklet angular resolution
-  float mDyB;        // parameterization for tracklet angular resolution
-  float mDyC2;       // parameterization for tracklet angular resolution
-  float mAngleToDyA; // parameterization for conversion track angle -> tracklet deflection
-  float mAngleToDyB; // parameterization for conversion track angle -> tracklet deflection
-  float mAngleToDyC; // parameterization for conversion track angle -> tracklet deflection
+  const GPUTRDRecoParam* mRecoParam; // TRD RecoParam
   /// ---- end error parametrization ----
   bool mDebugOutput;                                  // store debug output
   static constexpr const float sRadialOffset = -0.1f; // due to (possible) mis-calibration of t0 -> will become obsolete when tracklet conversion is done outside of the tracker