Fetch only GPUSettingsRecTRD for TRD tasks not all GPU ConfigurableParams

Author: davidrohr

Detectors/Align/src/AlignableDetectorTRD.cxx

@@ -178,9 +178,7 @@ int AlignableDetectorTRD::processPoints(GIndex gid, int npntCut, bool inv)
   auto propagator = o2::base::Propagator::Instance(); // float version!
   static bool firstCall = true;
   if (firstCall) {
-    o2::gpu::GPUO2InterfaceConfiguration config;
-    config.ReadConfigurableParam(config);
-    mRecoParam.init(propagator->getNominalBz(), &config.configReconstruction);
+    mRecoParam.init(propagator->getNominalBz());
     firstCall = false;
   }
   const auto* transformer = mController->getTRDTransformer();

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

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

Detectors/TRD/calibration/src/TrackBasedCalib.cxx

@@ -36,9 +36,7 @@ void TrackBasedCalib::reset()
 void TrackBasedCalib::init()
 {
   bz = o2::base::Propagator::Instance()->getNominalBz();
-  o2::gpu::GPUO2InterfaceConfiguration config;
-  config.ReadConfigurableParam(config);
-  mRecoParam.init(bz, &config.configReconstruction);
+  mRecoParam.init(bz);
 }
 
 void TrackBasedCalib::setInput(const o2::globaltracking::RecoContainer& input)

Detectors/TRD/qc/src/Tracking.cxx

@@ -26,9 +26,7 @@ using namespace o2::trd::constants;
 
 void Tracking::init()
 {
-  o2::gpu::GPUO2InterfaceConfiguration config;
-  config.ReadConfigurableParam(config);
-  mRecoParam.init(o2::base::Propagator::Instance()->getNominalBz(), &config.configReconstruction);
+  mRecoParam.init(o2::base::Propagator::Instance()->getNominalBz());
 }
 
 void Tracking::setInput(const o2::globaltracking::RecoContainer& input)

GPU/GPUTracking/DataTypes/GPUTRDRecoParam.cxx

@@ -13,17 +13,29 @@
 /// \brief Error parameterizations and helper functions for TRD reconstruction
 /// \author Ole Schmidt
 
+#include "GPUO2ExternalUser.h"
+#include "GPUCommonRtypes.h"
 #include "GPUSettings.h"
 #include "GPUTRDRecoParam.h"
 #include "GPUCommonLogger.h"
 #include "GPUCommonMath.h"
+#include "GPUO2InterfaceConfiguration.inc"
 
 using namespace o2::gpu;
 
 // error parameterizations taken from http://cds.cern.ch/record/2724259 Appendix A
 void GPUTRDRecoParam::init(float bz, const GPUSettingsRec* rec)
 {
-  float resRPhiIdeal2 = rec ? rec->trd.trkltResRPhiIdeal * rec->trd.trkltResRPhiIdeal : 1.6e-3f;
+  float resRPhiIdeal2 = 1.6e-3f;
+  if (rec) {
+    resRPhiIdeal2 = rec->trd.trkltResRPhiIdeal * rec->trd.trkltResRPhiIdeal;
+  }
+#ifndef GPUCA_STANDALONE
+  else {
+    const auto& rtrd = GPU_GET_CONFIG(GPUSettingsRecTRD);
+    resRPhiIdeal2 = rtrd.trkltResRPhiIdeal * rtrd.trkltResRPhiIdeal;
+  }
+#endif
 
   if (CAMath::Abs(CAMath::Abs(bz) - 2) < 0.1) {
     if (bz > 0) {