Leave single implementation of TRD RecoParam

shahor02 · shahor02 · commit bd6d027180b9 · 2026-01-28T20:43:06.000+01:00
diff --git a/Detectors/Align/include/Align/AlignableDetectorTRD.h b/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
diff --git a/Detectors/TPC/calibration/SpacePoints/include/SpacePoints/TrackInterpolation.h b/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
diff --git a/Detectors/TRD/base/CMakeLists.txt b/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
diff --git a/Detectors/TRD/base/include/TRDBase/RecoParam.h b/Detectors/TRD/base/include/TRDBase/RecoParam.h
diff --git a/Detectors/TRD/base/src/RecoParam.cxx b/Detectors/TRD/base/src/RecoParam.cxx
diff --git a/Detectors/TRD/base/src/TRDBaseLinkDef.h b/Detectors/TRD/base/src/TRDBaseLinkDef.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> + ;
diff --git a/Detectors/TRD/calibration/CMakeLists.txt b/Detectors/TRD/calibration/CMakeLists.txt
@@ -28,6 +28,7 @@ o2_add_library(TRDCalibration
                                      O2::DetectorsBase
                                      O2::DetectorsCalibration
                                      O2::MathUtils
+                                     O2::GPUTracking
                                      O2::DetectorsDCS)
 
  o2_target_root_dictionary(TRDCalibration
diff --git a/Detectors/TRD/calibration/include/TRDCalibration/TrackBasedCalib.h b/Detectors/TRD/calibration/include/TRDCalibration/TrackBasedCalib.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
diff --git a/Detectors/TRD/qc/CMakeLists.txt b/Detectors/TRD/qc/CMakeLists.txt
@@ -21,6 +21,7 @@ o2_add_library(TRDQC
                                      O2::DataFormatsTRD
                                      O2::DataFormatsGlobalTracking
                                      O2::DetectorsBase
+                                     O2::GPUTracking
                                      O2::MathUtils)
 
  o2_target_root_dictionary(TRDQC
diff --git a/Detectors/TRD/qc/include/TRDQC/Tracking.h b/Detectors/TRD/qc/include/TRDQC/Tracking.h
@@ -25,7 +25,7 @@
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "DataFormatsTPC/TrackTPC.h"
 #include "DetectorsBase/Propagator.h"
-#include "TRDBase/RecoParam.h"
+#include "GPUTRDRecoParam.h"
 
 #include "Rtypes.h"
 #include "TH1.h"
@@ -107,7 +107,7 @@ class Tracking
   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
   bool mPID{true};                                   ///< if TPC only tracks are not available we don't fill PID info
   bool mApplyShift{true};
 
diff --git a/Detectors/TRD/workflow/include/TRDWorkflow/TRDGlobalTrackingSpec.h b/Detectors/TRD/workflow/include/TRDWorkflow/TRDGlobalTrackingSpec.h
@@ -20,6 +20,7 @@
 #include "TRDBase/GeometryFlat.h"
 #include "GPUO2ExternalUser.h"
 #include "GPUTRDTracker.h"
+#include "GPUTRDRecoParam.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "DataFormatsGlobalTracking/RecoContainer.h"
 #include "DataFormatsTRD/TrackTRD.h"
@@ -34,7 +35,6 @@
 #include "TPCCalibration/CorrectionMapsLoader.h"
 #include "GPUO2InterfaceRefit.h"
 #include "TPCFastTransform.h"
-#include "TRDBase/RecoParam.h"
 #include "DataFormatsTPC/TrackTPC.h"
 #include "DataFormatsITS/TrackITS.h"
 #include "DataFormatsITSMFT/TrkClusRef.h"
@@ -94,7 +94,7 @@ class TRDGlobalTracking : public o2::framework::Task
   // temporary members -> should go into processor (GPUTRDTracker or additional refit processor?)
   std::unique_ptr<o2::gpu::GPUO2InterfaceRefit> mTPCRefitter;         ///< TPC refitter used for TPC tracks refit during the reconstruction
   const o2::tpc::ClusterNativeAccess* mTPCClusterIdxStruct = nullptr; ///< struct holding the TPC cluster indices
-  RecoParam mRecoParam;                                               ///< parameters required for TRD reconstruction
+  o2::gpu::GPUTRDRecoParam mRecoParam;                                ///< parameters required for TRD reconstruction
   gsl::span<const Tracklet64> mTrackletsRaw;                          ///< array of raw tracklets needed for TRD refit
   gsl::span<const CalibratedTracklet> mTrackletsCalib;                ///< array of calibrated tracklets needed for TRD refit
   gsl::span<const o2::tpc::TrackTPC> mTPCTracksArray;                 ///< input TPC tracks used for refit
diff --git a/GPU/GPUTracking/CMakeLists.txt b/GPU/GPUTracking/CMakeLists.txt
@@ -59,6 +59,7 @@ set(SRCS
     Merger/GPUTPCGMPhysicalTrackModel.cxx
     Merger/GPUTPCGMPolynomialFieldManager.cxx
     DataTypes/GPUTRDTrack.cxx
+    DataTypes/GPUTRDRecoParam.cxx
     TRDTracking/GPUTRDTracker.cxx
     TRDTracking/GPUTRDTrackletWord.cxx
     TRDTracking/GPUTRDTrackerKernels.cxx
@@ -68,7 +69,7 @@ set(SRCS_DATATYPES DataTypes/GPUDataTypesConfig.cxx DataTypes/GPUConfigDump.cxx
 
 set(HDRS_CINT_O2 Merger/GPUTPCGMTrackParam.h Merger/GPUTPCGMMergedTrack.h Merger/GPUTPCGMSectorTrack.h Merger/GPUTPCGMBorderTrack.h TRDTracking/GPUTRDInterfaces.h)
 set(HDRS_CINT_DATATYPES DataTypes/GPUTPCGMMergedTrackHit.h)
-set(HDRS_CINT_O2_ADDITIONAL DataTypes/GPUSettings.h Definitions/GPUSettingsList.h DataTypes/GPUDataTypesIO.h DataTypes/GPUDataTypesConfig.h DataTypes/GPUDataTypesQA.h DataTypes/GPUTRDTrack.h DataTypes/CalibdEdxTrackTopologyPol.h DataTypes/CalibdEdxTrackTopologySpline.h) # Manual dependencies for ROOT dictionary generation
+set(HDRS_CINT_O2_ADDITIONAL DataTypes/GPUSettings.h Definitions/GPUSettingsList.h DataTypes/GPUDataTypesIO.h DataTypes/GPUDataTypesConfig.h DataTypes/GPUDataTypesQA.h DataTypes/GPUTRDTrack.h DataTypes/GPUTRDRecoParam.h DataTypes/CalibdEdxTrackTopologyPol.h DataTypes/CalibdEdxTrackTopologySpline.h) # Manual dependencies for ROOT dictionary generation
 
 set(SRCS_NO_CINT
     DataTypes/GPUMemorySizeScalers.cxx
diff --git a/GPU/GPUTracking/DataTypes/GPUTRDRecoParam.cxx b/GPU/GPUTracking/DataTypes/GPUTRDRecoParam.cxx
@@ -0,0 +1,96 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file GPUTRDRecoParam.cxx
+/// \brief Error parameterizations and helper functions for TRD reconstruction
+/// \author Ole Schmidt
+
+#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)
+{
+  if (std::fabs(std::fabs(bz) - 2) < 0.1) {
+    if (bz > 0) {
+      // magnetic field +0.2 T
+      mRPhiA2 = 1.6e-3f;
+      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 {
+      // magnetic field -0.2 T
+      mRPhiA2 = 1.6e-3f;
+      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 (std::fabs(std::fabs(bz) - 5) < 0.1) {
+    if (bz > 0) {
+      // magnetic field +0.5 T
+      mRPhiA2 = 1.6e-3f;
+      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 {
+      // magnetic field -0.5 T
+      mRPhiA2 = 1.6e-3f;
+      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 {
+    LOGP(warning, "No error parameterization available for Bz= {}. Keeping default value (sigma_y = const. = 1cm)", bz);
+  }
+  LOGP(info, "Loaded parameterizations for Bz={}: PhiRes:[{},{},{}] DyRes:[{},{},{}] Angle2Dy:[{},{},{}]",
+       bz, mRPhiA2, mRPhiB, mRPhiC2, mDyA2, mDyB, mDyC2, mAngleToDyA, mAngleToDyB, mAngleToDyC);
+}
+
+void GPUTRDRecoParam::recalcTrkltCov(const float tilt, const float snp, const float rowSize, float* cov) const
+{
+  float t2 = tilt * tilt;      // tan^2 (tilt)
+  float c2 = 1.f / (1.f + t2); // cos^2 (tilt)
+  float sy2 = getRPhiRes(snp);
+  float sz2 = rowSize * rowSize / 12.f;
+  cov[0] = c2 * (sy2 + t2 * sz2);
+  cov[1] = c2 * tilt * (sz2 - sy2);
+  cov[2] = c2 * (t2 * sy2 + sz2);
+}
diff --git a/GPU/GPUTracking/DataTypes/GPUTRDRecoParam.h b/GPU/GPUTracking/DataTypes/GPUTRDRecoParam.h
diff --git a/GPU/GPUTracking/GPUTrackingLinkDef_O2.h b/GPU/GPUTracking/GPUTrackingLinkDef_O2.h
