Leave single implementation of TRD RecoParam, init from GPUSettingsRecTRD

Author: shahor02

Detectors/Align/include/Align/AlignableDetectorTRD.h

@@ -18,7 +18,7 @@
 #define ALIGNABLEDETECTORTRD_H
 
 #include "Align/AlignableDetector.h"
-#include "TRDBase/RecoParam.h"
+#include "GPUTRDRecoParam.h"
 
 namespace o2
 {
@@ -64,7 +64,7 @@ class AlignableDetectorTRD final : public AlignableDetector
   int processPoints(GIndex gid, int npntCut, bool inv) final;
 
  protected:
-  o2::trd::RecoParam mRecoParam;    // parameters required for TRD reconstruction
+  o2::gpu::GPUTRDRecoParam mRecoParam; // parameters required for TRD reconstruction
   double mNonRCCorrDzDtgl = 0.;     // correction in Z for non-crossing tracklets
   double mCorrDVT = 0.;             // correction to Vdrift*t
   double mExtraErrRC[2] = {0., 0.}; // extra errors for RC tracklets

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/include/SpacePoints/TrackInterpolation.h

@@ -39,7 +39,7 @@
 #include "TPCReconstruction/TPCFastTransformHelperO2.h"
 #include "DetectorsBase/Propagator.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
-#include "TRDBase/RecoParam.h"
+#include "GPUTRDRecoParam.h"
 #include "TRDBase/Geometry.h"
 
 class TTree;
@@ -441,7 +441,7 @@ class TrackInterpolation
   std::vector<o2::dataformats::GlobalTrackID> mGIDsSuccess;       ///< keep track of the GIDs which could be processed successfully
 
   // helpers
-  o2::trd::RecoParam mRecoParam;                      ///< parameters required for TRD refit
+  o2::gpu::GPUTRDRecoParam mRecoParam;                ///< parameters required for TRD refit
   o2::trd::Geometry* mGeoTRD;                         ///< TRD geometry instance (needed for tilted pad correction)
   std::unique_ptr<TPCFastTransform> mFastTransform{}; ///< TPC cluster transformation
   float mBz;                                          ///< required for helix approximation

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/base/CMakeLists.txt

@@ -16,7 +16,6 @@ o2_add_library(TRDBase
                        src/GeometryFlat.cxx
                        src/PadResponse.cxx
                        src/FeeParam.cxx
-                       src/RecoParam.cxx
                        src/ChamberStatus.cxx
                        src/Calibrations.cxx
                        src/CalOnlineGainTables.cxx
@@ -38,7 +37,6 @@ o2_target_root_dictionary(TRDBase
                                   include/TRDBase/GeometryFlat.h
                                   include/TRDBase/PadResponse.h
                                   include/TRDBase/FeeParam.h
-                                  include/TRDBase/RecoParam.h
                                   include/TRDBase/Calibrations.h
                                   include/TRDBase/PadParameters.h
                                   include/TRDBase/PadCalibrations.h

Detectors/TRD/base/include/TRDBase/RecoParam.h

@@ -19,7 +19,6 @@
 #pragma link C++ class o2::trd::Geometry + ;
 #pragma link C++ class o2::trd::GeometryBase + ;
 #pragma link C++ class o2::trd::FeeParam + ;
-#pragma link C++ class o2::trd::RecoParam + ;
 #pragma link C++ class o2::trd::PadResponse + ;
 #pragma link C++ class o2::trd::PadParameters < float > +;
 #pragma link C++ class o2::trd::PadParameters < char> + ;

Detectors/TRD/base/src/RecoParam.cxx

@@ -28,6 +28,7 @@ o2_add_library(TRDCalibration
                                      O2::DetectorsBase
                                      O2::DetectorsCalibration
                                      O2::MathUtils
+                                     O2::GPUTracking
                                      O2::DetectorsDCS)
 
  o2_target_root_dictionary(TRDCalibration

Detectors/TRD/base/src/TRDBaseLinkDef.h

@@ -24,7 +24,7 @@
 #include "DataFormatsTRD/NoiseCalibration.h"
 #include "TRDBase/PadCalibrationsAliases.h"
 #include "DetectorsBase/Propagator.h"
-#include "TRDBase/RecoParam.h"
+#include "GPUTRDRecoParam.h"
 
 #include "Rtypes.h"
 
@@ -90,7 +90,7 @@ class TrackBasedCalib
   float mMaxSnp{o2::base::Propagator::MAX_SIN_PHI};  ///< max snp when propagating tracks
   float mMaxStep{o2::base::Propagator::MAX_STEP};    ///< maximum step for propagation
   MatCorrType mMatCorr{MatCorrType::USEMatCorrNONE}; ///< if material correction should be done
-  RecoParam mRecoParam;                              ///< parameters required for TRD reconstruction
+  o2::gpu::GPUTRDRecoParam mRecoParam;               ///< parameters required for TRD reconstruction
   AngularResidHistos mAngResHistos;                  ///< aggregated data for the track based calibration
   std::vector<int> mGainCalibHistos;                 ///< aggregated input data for gain calibration
   float bz;                                          ///< magnetic field