core/base/CbmTrackingDetectorInterfaceBase.cxx

@@ -34,10 +34,15 @@ bool CbmTrackingDetectorInterfaceBase::Check() const
     // Station individual parameters check
     for (int iSt = 0; iSt < this->GetNtrackingStations(); ++iSt) {
       std::string prefix = std::string("\t- Station ") + std::to_string(iSt) + " has ";
-      // Position along Z-axis
-      if (std::isnan(this->GetZ(iSt))) {
-        msg << prefix << " NaN component along Z-axis (" << this->GetZ(iSt) << " cm)\n";
-        res = false && res;
+
+      {  // Position along Z-axis
+        double z0 = this->GetZmin(iSt);
+        double z1 = this->GetZref(iSt);
+        double z2 = this->GetZmax(iSt);
+        if (!std::isfinite(z0) || !std::isfinite(z1) || !std::isfinite(z2) || !(z0 < z1 && z1 < z2)) {
+          msg << prefix << " wrong Z position (" << z0 << " < " << z1 << " < " << z2 << " cm)\n";
+          res = false && res;
+        }
       }
 
       // Size along X-axis
@@ -53,40 +58,12 @@ bool CbmTrackingDetectorInterfaceBase::Check() const
         msg << prefix << " zero, negative or NaN Y-size (" << yMax << " cm)\n";
         res = false && res;
       }
-
-      // Max station radius
-      auto rMax = this->GetRmax(iSt);
-      if (rMax < std::numeric_limits<double>::epsilon() || std::isnan(rMax)) {
-        msg << prefix << " zero, negative or NaN outer radius (" << rMax << " cm)\n";
-        res = false && res;
-      }
-
-      // Min station radius
-      auto rMin = this->GetRmin(iSt);
-      if (rMin < 0 || std::isnan(rMin)) {
-        msg << prefix << " negative or NaN inner radius (" << rMin << " cm)\n";
-        res = false && res;
-      }
-
-      // Front strips stereo angle
-      auto angleF = this->GetStripsStereoAngleFront(iSt);
-      if (std::isnan(angleF)) {
-        msg << prefix << " NaN front strips stereo angle (" << angleF << " rad)\n";
-        res = false && res;
-      }
-
-      // Back strips stereo angle
-      auto angleB = this->GetStripsStereoAngleBack(iSt);
-      if (std::isnan(angleF)) {
-        msg << prefix << " NaN back strips stereo angle (" << angleB << " rad)\n";
-        res = false && res;
-      }
     }
 
     // Position along beam axis
     std::vector<double> zPositions(this->GetNtrackingStations());
     for (int iSt = 0; iSt < this->GetNtrackingStations(); ++iSt) {
-      zPositions[iSt] = this->GetZ(iSt);
+      zPositions[iSt] = this->GetZref(iSt);
     }
     std::set<double> zPositionSet(zPositions.begin(), zPositions.end());
     if (zPositions.size() != zPositionSet.size()) {
@@ -117,55 +94,21 @@ std::string CbmTrackingDetectorInterfaceBase::ToString() const
   table << "\nTracking detector interface: " << setw(5) << setfill(' ') << GetDetectorName() << '\n';
   table << setw(5) << setfill(' ') << "st.No" << ' ';
   table << setw(10) << setfill(' ') << "z[cm]" << ' ';
-  table << setw(10) << setfill(' ') << "R_min[cm]" << ' ';
-  table << setw(10) << setfill(' ') << "R_max[cm]" << ' ';
+  table << setw(10) << setfill(' ') << "z_min[cm]" << ' ';
+  table << setw(10) << setfill(' ') << "z_max[cm]" << ' ';
   table << setw(10) << setfill(' ') << "x_max[cm]" << ' ';
   table << setw(10) << setfill(' ') << "y_max[cm]" << ' ';
   table << setw(11) << setfill(' ') << "angleF[rad]" << ' ';
   table << setw(11) << setfill(' ') << "angleB[rad]" << ' ';
-  table << setw(10) << setfill(' ') << "dz [cm]" << ' ';
-  table << setw(10) << setfill(' ') << "RL [cm]" << '\n';
+  table << '\n';
   for (int iSt = 0; iSt < GetNtrackingStations(); ++iSt) {
     table << setw(5) << setfill(' ') << iSt << ' ';
-    table << setw(10) << setfill(' ') << GetZ(iSt) << ' ';
-    table << setw(10) << setfill(' ') << GetRmin(iSt) << ' ';
-    table << setw(10) << setfill(' ') << GetRmax(iSt) << ' ';
+    table << setw(10) << setfill(' ') << GetZref(iSt) << ' ';
+    table << setw(10) << setfill(' ') << GetZmin(iSt) << ' ';
+    table << setw(10) << setfill(' ') << GetZmax(iSt) << ' ';
     table << setw(10) << setfill(' ') << GetXmax(iSt) << ' ';
     table << setw(10) << setfill(' ') << GetYmax(iSt) << ' ';
-    table << setw(11) << setfill(' ') << GetStripsStereoAngleFront(iSt) << ' ';
-    table << setw(11) << setfill(' ') << GetStripsStereoAngleBack(iSt) << ' ';
-    table << setw(10) << setfill(' ') << GetThickness(iSt) << ' ';
-    table << setw(10) << setfill(' ') << GetRadLength(iSt) << '\n';
+    table << '\n';
   }
   return table.str();
 }
-
-// ---------------------------------------------------------------------------------------------------------------------
-//
-void CbmTrackingDetectorInterfaceBase::InitConversionMatrices()
-{
-  int nStations = GetNtrackingStations();
-  fvConvUVtoXY.clear();
-  fvConvUVtoXY.resize(nStations);
-  fvConvXYtoUV.clear();
-  fvConvXYtoUV.resize(nStations);
-  for (int iS = 0; iS < nStations; ++iS) {
-    double phiF = GetStripsStereoAngleFront(iS);
-    double phiB = GetStripsStereoAngleBack(iS);
-    double cF   = std::cos(phiF);
-    double sF   = std::sin(phiF);
-    double cB   = std::cos(phiB);
-    double sB   = std::sin(phiB);
-    double det  = cF * sB - sF * cB;
-    // (x,y) -> (u,v)
-    fvConvUVtoXY[iS][0] = cF;
-    fvConvUVtoXY[iS][1] = sF;
-    fvConvUVtoXY[iS][2] = cB;
-    fvConvUVtoXY[iS][3] = sB;
-    // (u,v) -> (x,y)
-    fvConvXYtoUV[iS][0] = sB / det;
-    fvConvXYtoUV[iS][1] = -sF / det;
-    fvConvXYtoUV[iS][2] = -cB / det;
-    fvConvXYtoUV[iS][3] = cF / det;
-  }
-}

core/base/CbmTrackingDetectorInterfaceBase.h

@@ -35,40 +35,6 @@ public:
   /// Gets actual number of stations, provided by the current geometry setup
   virtual int GetNtrackingStations() const = 0;
 
-  // TODO: SZh 17.10.2022: At the moment the radiation length and the station thickness are not used for the tracking
-  //                       initialization as soon as the material budget maps are in use. Should we keep these
-  //                       accessors here, or just remove them from the interfaces?
-
-  /// Gets station radiation length
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Radiation length [cm]
-  virtual double GetRadLength(int stationId) const = 0;
-
-  /// Gets size of inner radius of station
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station inner radius [cm]
-  virtual double GetRmin(int stationId) const = 0;
-
-  /// Gets size of outer radius of station
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station outer radius [cm]
-  virtual double GetRmax(int stationId) const = 0;
-
-  /// Gets front strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for front strips [rad]
-  virtual double GetStripsStereoAngleFront(int stationId) const = 0;
-
-  /// Gets back strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for back strips [rad]
-  virtual double GetStripsStereoAngleBack(int stationId) const = 0;
-
-  /// Gets station thickness along the Z-axis
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Station thickness [cm]
-  virtual double GetThickness(int stationId) const = 0;
-
   /// Gets a tracking station of a CbmPixelHit
   /// \param  hit  A pointer to CbmPixelHit
   /// \return Local index of the tracking station
@@ -95,81 +61,42 @@ public:
   /// \return Size of station along the Y-axis [cm]
   virtual double GetYmax(int stationId) const = 0;
 
-  /// Gets z component of the station position
+  /// Gets reference z of the station
+  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
+  /// \return Z position of the station [cm]
+  virtual double GetZref(int stationId) const = 0;
+
+  /// Gets min z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Z position of station [cm]
-  virtual double GetZ(int stationId) const = 0;
+  /// \return min Z of the station [cm]
+  virtual double GetZmin(int stationId) const = 0;
+
+  /// Gets max z of the station
+  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
+  /// \return max Z of the station [cm]
+  virtual double GetZmax(int stationId) const = 0;
 
   /// Check if station provides time measurements
   /// \param  stationId  Tracking station ID in the setup
   /// \return Flag: true - station provides time measurements, false - station does not provide time measurements
   virtual bool IsTimeInfoProvided(int stationId) const = 0;
 
+  /// Gets stereo angles of the two independent measured coordinates
+  /// The tracking does not use this method. It is only used by the QA task.
+  /// \param  address  detector unique identifier
+  /// \return [phiU, phiV] - Stereo angles [rad]
+  virtual std::tuple<double, double> GetStereoAnglesSensor(int address) const = 0;
+
   /// Technical flag: true - all downcasts are done with dynamic_cast followed by checks for nullptr (increases
   //  computing time, better for debug), false - all downcasts are done with static_cast without sanity checks
   //  (decreases computing time, but can cause bugs)
   static constexpr bool kUseDynamicCast {true};
 
-  /// @brief Conversion function (x,y) -> (u,v)
-  /// @param  iSt  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// @param  x X-coordinate
-  /// @param  y Y-coordinate
-  /// @return pair [u, v]
-  std::pair<double, double> ConvertXYtoUV(int iSt, double x, double y) const
-  {
-    return std::make_pair(fvConvXYtoUV[iSt][0] * x + fvConvXYtoUV[iSt][1] * y,
-                          fvConvXYtoUV[iSt][2] * x + fvConvXYtoUV[iSt][3] * y);
-  }
-
-  /// @brief Conversion function (x,y) -> (u,v)
-  /// @param  iSt  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// @param  u U-coordinate
-  /// @param  v V-coordinate
-  /// @return pair [x, y]
-  std::pair<double, double> ConvertUVtoXY(int iSt, double u, double v) const
-  {
-    return std::make_pair(fvConvUVtoXY[iSt][0] * u + fvConvUVtoXY[iSt][1] * v,
-                          fvConvUVtoXY[iSt][2] * u + fvConvUVtoXY[iSt][3] * v);
-  }
-
-  /// @brief Conversion function (du2, dv2) -> (dx2, dxy, dy2)
-  /// @param  iSt  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// @param du2  Variance of U-coordinate measurement
-  /// @param dv2  Variance of V-coordinate measurement
-  /// @return tuple [dx2, dxy, dy2]
-  std::tuple<double, double, double> ConvertCovMatrixUVtoXY(int iSt, double du2, double dv2) const
-  {
-    return std::make_tuple(
-      fvConvUVtoXY[iSt][0] * fvConvUVtoXY[iSt][0] * du2 + fvConvUVtoXY[iSt][1] * fvConvUVtoXY[iSt][1] * dv2,
-      fvConvUVtoXY[iSt][0] * fvConvUVtoXY[iSt][2] * du2 + fvConvUVtoXY[iSt][1] * fvConvUVtoXY[iSt][3] * dv2,
-      fvConvUVtoXY[iSt][2] * fvConvUVtoXY[iSt][2] * du2 + fvConvUVtoXY[iSt][3] * fvConvUVtoXY[iSt][3] * dv2);
-  }
-
   /// Checks detector interface: boundary conditions of the parameters
   bool Check() const;
 
   /// Prints all the parameters into table and saves the table as a string
   std::string ToString() const;
-
-protected:
-  /// @brief Initialized conversion matrices between (u,v) and (x,y) coordinate systems
-  void InitConversionMatrices();
-
-  /// @brief Vector of arrays of conversion matrices from (u,v) to (x,y) coordinate systems in different stations
-  ///
-  /// @note  Indeces specification:
-  /// |x| = |fvConvUVtoXY[0]  fvConvUVtoXY[1]| * |u|
-  /// |y|   |fvConvUVtoXY[2]  fvConvUVtoXY[2]|   |v|
-  ///
-  std::vector<std::array<double, 4>> fvConvUVtoXY;
-
-  /// @brief Vector of arrays of conversion matrices from (x,y) to (u,v) coordinate systems in different stations
-  ///
-  /// @note  Indeces specification:
-  /// |u| = |fvConvXYtoUV[0]  fvConvXYtoUV[1]| * |x|
-  /// |v|   |fvConvXYtoUV[2]  fvConvXYtoUV[2]|   |y|
-  ///
-  std::vector<std::array<double, 4>> fvConvXYtoUV;
 };
 
 // **********************************************************
@@ -184,7 +111,7 @@ inline int CbmTrackingDetectorInterfaceBase::GetTrackingStationIndex(double zPos
   int nStations   = GetNtrackingStations();
   int iStSelected = -1;
   for (int iSt = 0; iSt < nStations; ++iSt) {
-    auto dist = std::fabs(zPos - GetZ(iSt));
+    auto dist = std::fabs(zPos - GetZref(iSt));
     if (dist < bestDist) {
       bestDist    = dist;
       iStSelected = iSt;

core/detectors/much/CbmMuchTrackingInterface.cxx

@@ -77,9 +77,6 @@ InitStatus CbmMuchTrackingInterface::Init()
     return kFATAL;
   }
 
-  // Init conversion matrices
-  InitConversionMatrices();
-
   // Keep Track of how many layers are present in each station (may be heterogenous)
   for (int iMuchSt = 0; iMuchSt < fGeoScheme->GetNStations(); ++iMuchSt) {
     fNbLayersPerStation.push_back(fGeoScheme->GetStation(iMuchSt)->GetNLayers());

core/detectors/much/CbmMuchTrackingInterface.h

@@ -57,35 +57,20 @@ public:
   /// Gets actual number of tracking stations, provided by the current geometry setup
   int GetNtrackingStations() const;
 
-  /// Gets station radiation length
+  /// Gets reference z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Radiation length [cm]
-  double GetRadLength(int /*stationId*/) const { return 0; }  // TODO: Replace with correct value
+  /// \return Z position of the station [cm]
+  double GetZref(int stationId) const { return GetMuchLayer(stationId)->GetZ(); }
 
-  /// Gets size of outer radius of station
+  /// Gets min z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station outer radius [cm]
-  double GetRmax(int /*stationId*/) const { return 100.; }
+  /// \return min Z of the station [cm]
+  double GetZmin(int stationId) const { return GetZref(stationId) - 0.5 * GetMuchLayer(stationId)->GetDz(); }
 
-  /// Gets size of inner radius of station
+  /// Gets max z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station inner radius [cm]
-  double GetRmin(int /*stationId*/) const { return 10.; }
-
-  /// Gets back strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for back strips [rad]
-  double GetStripsStereoAngleBack(int /*stationId*/) const { return TMath::Pi() / 2.; }
-
-  /// Gets front strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for front strips [rad]
-  double GetStripsStereoAngleFront(int /*stationId*/) const { return 0.; }
-
-  /// Gets station thickness along the Z-axis
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Station thickness [cm]
-  double GetThickness(int stationId) const { return GetMuchLayer(stationId)->GetDz(); };
+  /// \return max Z of the station [cm]
+  double GetZmax(int stationId) const { return GetZref(stationId) + 0.5 * GetMuchLayer(stationId)->GetDz(); }
 
   /// Gets a tracking station of a CbmPixelHit
   /// \param  hit  A pointer to CbmPixelHit
@@ -95,10 +80,7 @@ public:
   /// Gets a tracking station by the address of element
   /// \param  address  Unique element address
   /// \return Local index of the tracking station
-  int GetTrackingStationIndex(int address) const
-  {
-    return CbmMuchGeoScheme::GetStationIndex(address) * 3 + CbmMuchGeoScheme::GetLayerIndex(address);
-  }
+  int GetTrackingStationIndex(int address) const { return CbmMuchGeoScheme::GetStationIndex(address); }
 
   /// Gets max size of a station along the X-axis
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
@@ -110,16 +92,17 @@ public:
   /// \return Size of station along the Y-axis [cm]
   double GetYmax(int /*stationId*/) const { return 100.; }
 
-  /// Gets z component of the station position
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Z position of station [cm]
-  double GetZ(int stationId) const { return GetMuchLayer(stationId)->GetZ(); }
-
   /// Check if station provides time measurements
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
   /// \return Flag: true - station provides time measurements, false - station does not provide time measurements
   bool IsTimeInfoProvided(int /*stationId*/) const { return true; }
 
+  /// Gets stereo angles of the two independent measured coordinates
+  /// The tracking does not use this method. It is only used by the QA task.
+  /// \param  address  detector unique identifier
+  /// \return [phiU, phiV] - Stereo angles [rad]
+  std::tuple<double, double> GetStereoAnglesSensor(int /*address*/) const { return std::tuple(0., TMath::Pi() / 2.); }
+
   /// FairTask: sets parameter containers up
   void SetParContainers();
 

core/detectors/mvd/CbmMvdTrackingInterface.cxx

@@ -41,9 +41,6 @@ InitStatus CbmMvdTrackingInterface::Init()
 
   if (!fMvdStationPar) { return kFATAL; }
 
-  // Init conversion matrices
-  InitConversionMatrices();
-
   // Check the validity of the parameters
   if (!this->Check()) {
     LOG(error)

core/detectors/mvd/CbmMvdTrackingInterface.h

@@ -56,54 +56,20 @@ public:
   /// Gets actual number of tracking stations, provided by the current geometry setup
   int GetNtrackingStations() const { return fMvdStationPar->GetStationCount(); }
 
-  /// Gets the tracking station radiation length
+  /// Gets reference z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Radiation length [cm]
-  double GetRadLength(int stationId) const
-  {
-    return fMvdStationPar->GetZThickness(stationId) / (10. * fMvdStationPar->GetZRadThickness(stationId));
-  }
-
-  /// Gets size of outer radius of a tracking station
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station outer radius [cm]
-  double GetRmax(int stationId) const
-  {
-    return std::max(fMvdStationPar->GetHeight(stationId), fMvdStationPar->GetWidth(stationId));
-  }
-
-  /// Gets size of inner radius of a tracking station
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station inner radius [cm]
-  double GetRmin(int stationId) const
-  {
-    return std::min(fMvdStationPar->GetBeamHeight(stationId), fMvdStationPar->GetBeamWidth(stationId));
-  }
-
-  /// Gets spatial resolution (RMS) for back strips
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Spatial resolution (RMS) for front strips [cm]
-  double GetStripsSpatialRmsBack(int stationId) const { return fMvdStationPar->GetYRes(stationId) / 10000.; }
-
-  /// Gets spatial resolution (RMS) for front strips
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Spatial resolution (RMS) for front strips [cm]
-  double GetStripsSpatialRmsFront(int stationId) const { return fMvdStationPar->GetXRes(stationId) / 10000.; }
+  /// \return Z position of the station [cm]
+  double GetZref(int stationId) const { return fMvdStationPar->GetZPosition(stationId); }
 
-  /// Gets back strips stereo angle
+  /// Gets min z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for back strips [rad]
-  double GetStripsStereoAngleBack(int /*stationId*/) const { return TMath::Pi() / 2.; }
+  /// \return min Z of the station [cm]
+  double GetZmin(int stationId) const { return GetZref(stationId) - 0.5 * fMvdStationPar->GetZThickness(stationId); }
 
-  /// Gets front strips stereo angle
+  /// Gets max z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for front strips [rad]
-  double GetStripsStereoAngleFront(int /*stationId*/) const { return 0.; }
-
-  /// Gets the tracking station thickness along the Z-axis
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Station thickness [cm]
-  double GetThickness(int stationId) const { return fMvdStationPar->GetZThickness(stationId); }
+  /// \return max Z of the station [cm]
+  double GetZmax(int stationId) const { return GetZref(stationId) + 0.5 * fMvdStationPar->GetZThickness(stationId); }
 
   /// Gets a tracking station of a CbmPixelHit
   /// \param  hit  A pointer to CbmPixelHit
@@ -127,26 +93,40 @@ public:
   /// Gets max size of a tracking station along the X-axis
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
   /// \return Size of station along the X-axis [cm]
-  double GetXmax(int stationId) const { return this->GetRmax(stationId); }
+  double GetXmax(int stationId) const { return fMvdStationPar->GetWidth(stationId); }
 
   /// Gets max size of a tracking station along the Y-axis
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
   /// \return Size of station along the Y-axis [cm]
-  double GetYmax(int stationId) const { return this->GetRmax(stationId); }
-
-  /// Gets z component of the tracking station position
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Z position of station [cm]
-  double GetZ(int stationId) const { return fMvdStationPar->GetZPosition(stationId); }
+  double GetYmax(int stationId) const { return fMvdStationPar->GetHeight(stationId); }
 
   /// Check if the detector provides time measurements
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
   /// \return Flag: true - station provides time measurements, false - station does not provide time measurements
   bool IsTimeInfoProvided(int /*stationId*/) const { return false; }
 
+  /// Gets stereo angles of the two independent measured coordinates
+  /// The tracking does not use this method. It is only used by the QA task.
+  /// \param  address  detector unique identifier
+  /// \return [phiU, phiV] - Stereo angles [rad]
+  std::tuple<double, double> GetStereoAnglesSensor(int /*address*/) const { return std::tuple(0., TMath::Pi() / 2.); }
+
   /// FairTask: sets parameter containers up
   void SetParContainers();
 
+  /// --- to be removed --- Gets the tracking station radiation length
+  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
+  /// \return Radiation length [cm]
+  double GetRadLength(int stationId) const
+  {
+    return fMvdStationPar->GetZThickness(stationId) / (10. * fMvdStationPar->GetZRadThickness(stationId));
+  }
+
+  /// --- to be removed --- Gets the tracking station thickness along the Z-axis
+  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
+  /// \return Station thickness [cm]
+  double GetSensorThickness(int stationId) const { return fMvdStationPar->GetZThickness(stationId); }
+
   /// Copy and move constructers and assign operators are prohibited
   CbmMvdTrackingInterface(const CbmMvdTrackingInterface&) = delete;
   CbmMvdTrackingInterface(CbmMvdTrackingInterface&&)      = delete;

core/detectors/sts/CbmStsTrackingInterface.cxx

@@ -37,23 +37,7 @@ CbmStsTrackingInterface::~CbmStsTrackingInterface()
 
 //-------------------------------------------------------------------------------------------------------------------------------------
 //
-double CbmStsTrackingInterface::GetStripsStereoAngleFront(int stationId) const
-{
-  auto station = GetStsStation(stationId);
-  return station->GetSensorRotation() + station->GetSensorStereoAngle(0) * TMath::Pi() / 180.;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------
-//
-double CbmStsTrackingInterface::GetStripsStereoAngleBack(int stationId) const
-{
-  auto station = GetStsStation(stationId);
-  return station->GetSensorRotation() + station->GetSensorStereoAngle(1) * TMath::Pi() / 180.;
-}
-
-//-------------------------------------------------------------------------------------------------------------------------------------
-//
-std::tuple<double, double> CbmStsTrackingInterface::GetStripStereoAnglesSensor(int address) const
+std::tuple<double, double> CbmStsTrackingInterface::GetStereoAnglesSensor(int address) const
 {
   /// Gets front & back strip angle
 
@@ -107,9 +91,6 @@ InitStatus CbmStsTrackingInterface::Init()
   if (!stsSetup->IsSensorParsInit()) { stsSetup->SetSensorParameters(fStsParSetSensor); }
   if (!stsSetup->IsSensorCondInit()) { stsSetup->SetSensorConditions(fStsParSetSensorCond); }
 
-  // Init conversion matrices
-  InitConversionMatrices();
-
   // Check the validity of the parameters
   if (!this->Check()) {
     LOG(error)

core/detectors/sts/CbmStsTrackingInterface.h

@@ -53,43 +53,11 @@ public:
   /// Gets actual number of the tracking stations, provided by the current geometry setup
   int GetNtrackingStations() const { return CbmStsSetup::Instance()->GetNofStations(); }
 
-  /// Gets station radiation length
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Radiation length [cm]
-  double GetRadLength(int stationId) const { return GetStsStation(stationId)->GetRadLength(); }
-
-  /// Gets size of outer radius of station
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station outer radius [cm]
-  double GetRmax(int stationId) const
-  {
-    return GetXmax(stationId) > GetYmax(stationId) ? GetXmax(stationId) : GetYmax(stationId);
-  }
-
-  /// Gets size of inner radius of station
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station inner radius [cm]
-  double GetRmin(int /*stationId*/) const { return 0.; }
-
-  /// Gets back strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for back strips [rad]
-  double GetStripsStereoAngleBack(int stationId) const;
-
-  /// Gets front strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for front strips [rad]
-  double GetStripsStereoAngleFront(int stationId) const;
-
-  /// Gets front and back strip stereo angle
-  /// \param  address  Unique element address
-  /// \return std::tie(front,back) - Stereo angle for the front and back strips [rad]
-  std::tuple<double, double> GetStripStereoAnglesSensor(int address) const;
-
-  /// Gets station thickness along the Z-axis
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Station thickness [cm]
-  double GetThickness(int stationId) const { return GetStsStation(stationId)->GetSensorD(); }
+  /// Gets stereo angles of the two independent measured coordinates
+  /// The tracking does not use this method. It is only used by the QA task.
+  /// \param  address  detector unique identifier
+  /// \return [phiU, phiV] - Stereo angles [rad]
+  std::tuple<double, double> GetStereoAnglesSensor(int address) const;
 
   /// Gets a tracking station of a CbmPixelHit
   /// \param  hit  A pointer to CbmPixelHit
@@ -148,6 +116,16 @@ public:
   /// \return Flag: true - station provides time measurements, false - station does not provide time measurements
   bool IsTimeInfoProvided(int /*stationId*/) const { return true; }
 
+  /// -- to be removed -- Gets station radiation length
+  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
+  /// \return Radiation length [cm]
+  double GetRadLength(int stationId) const { return GetStsStation(stationId)->GetRadLength(); }
+
+  /// -- to be removed -- Gets station thickness along the Z-axis
+  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
+  /// \return Station thickness [cm]
+  double GetSensorThickness(int stationId) const { return GetStsStation(stationId)->GetSensorD(); }
+
   /// FairTask: sets parameter containers up
   void SetParContainers();
 

core/detectors/tof/CbmTofTrackingInterface.cxx

@@ -83,9 +83,6 @@ InitStatus CbmTofTrackingInterface::Init()
     fTofStationZ[iSt] = fTofStationZ[iSt] / nTofStationModules[iSt];
   }
 
-  // Init conversion matrices
-  InitConversionMatrices();
-
   // Check the validity of the parameters
   if (!this->Check()) {
     LOG(error)

core/detectors/tof/CbmTofTrackingInterface.h

@@ -56,35 +56,20 @@ public:
   /// Gets actual number of tracking stations, provided by the current geometry setup
   int GetNtrackingStations() const { return fDigiBdfPar->GetNbTrackingStations(); }
 
-  /// Gets station radiation length
+  /// Gets reference z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Radiation length [cm]
-  double GetRadLength(int /*stationId*/) const { return 2.; }
+  /// \return Z position of the station [cm]
+  double GetZref(int stationId) const { return fTofStationZ[stationId]; }
 
-  /// Gets size of outer radius of station
+  /// Gets min z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station outer radius [cm]
-  double GetRmax(int /*stationId*/) const { return 150.; }
+  /// \return min Z of the station [cm]
+  double GetZmin(int stationId) const { return GetZref(stationId) - 5.; }
 
-  /// Gets size of inner radius of station
+  /// Gets max z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station inner radius [cm]
-  double GetRmin(int /*stationId*/) const { return 0.; }
-
-  /// Gets back strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for back strips [rad]
-  double GetStripsStereoAngleBack(int /*stationId*/) const { return 0.5 * TMath::Pi(); }
-
-  /// Gets front strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for front strips [rad]
-  double GetStripsStereoAngleFront(int /*stationId*/) const { return 0.; }
-
-  /// Gets station thickness along the Z-axis
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Station thickness [cm]
-  double GetThickness(int /*stationId*/) const { return 10.; }
+  /// \return max Z of the station [cm]
+  double GetZmax(int stationId) const { return GetZref(stationId) + 5.; }
 
   /// Gets a tracking station of a ToF hit
   /// \param  hit  A pointer to ToF hit
@@ -118,16 +103,17 @@ public:
   /// \return Size of station along the Y-axis [cm]
   double GetYmax(int /*stationId*/) const { return 20.; }
 
-  /// Gets z component of the station position
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Z position of station [cm]
-  double GetZ(int stationId) const { return fTofStationZ[stationId]; }
-
   /// Check if station provides time measurements
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
   /// \return Flag: true - station provides time measurements, false - station does not provide time measurements
   bool IsTimeInfoProvided(int /*stationId*/) const { return true; }
 
+  /// Gets stereo angles of the two independent measured coordinates
+  /// The tracking does not use this method. It is only used by the QA task.
+  /// \param  address  detector unique identifier
+  /// \return [phiU, phiV] - Stereo angles [rad]
+  std::tuple<double, double> GetStereoAnglesSensor(int /*address*/) const { return std::tuple(0., TMath::Pi() / 2.); }
+
   /// FairTask: sets parameter containers up
   void SetParContainers();
 

core/detectors/trd/CbmTrdTrackingInterface.cxx

@@ -68,9 +68,6 @@ InitStatus CbmTrdTrackingInterface::Init()
     }
   }
 
-  // Init conversion matrices
-  InitConversionMatrices();
-
   // Check the validity of the parameters
   if (!this->Check()) {
     LOG(error)

core/detectors/trd/CbmTrdTrackingInterface.h

@@ -53,35 +53,20 @@ public:
   /// Gets actual number of tracking stations, provided by the current geometry setup
   int GetNtrackingStations() const;
 
-  /// Gets station radiation length
+  /// Gets reference z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Radiation length [cm]
-  double GetRadLength(int /*stationId*/) const { return 1.6; }
+  /// \return Z position of the station [cm]
+  double GetZref(int stationId) const { return GetTrdModulePar(stationId)->GetZ(); }
 
-  /// Gets size of outer radius of station
+  /// Gets min z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station outer radius [cm]
-  double GetRmax(int stationId) const { return 2. * this->GetXmax(stationId); }
+  /// \return min Z of the station [cm]
+  double GetZmin(int stationId) const { return GetZref(stationId) - GetTrdModulePar(stationId)->GetSizeZ(); }
 
-  /// Gets size of inner radius of station
+  /// Gets max z of the station
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Size of station inner radius [cm]
-  double GetRmin(int /*stationId*/) const { return 0.; }
-
-  /// Gets back strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for back strips [rad]
-  double GetStripsStereoAngleBack(int /*stationId*/) const { return 0.5 * TMath::Pi(); }
-
-  /// Gets front strips stereo angle
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Absolute stereo angle for front strips [rad]
-  double GetStripsStereoAngleFront(int /*stationId*/) const { return 0.; }
-
-  /// Gets station thickness along the Z-axis
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Station thickness [cm]
-  double GetThickness(int stationId) const { return 2. * GetTrdModulePar(stationId)->GetSizeZ(); }
+  /// \return max Z of the station [cm]
+  double GetZmax(int stationId) const { return GetZref(stationId) + GetTrdModulePar(stationId)->GetSizeZ(); }
 
   /// Gets a tracking station of a CbmPixelHit
   /// \param  hit  A pointer to CbmPixelHit
@@ -103,16 +88,17 @@ public:
   /// \return Size of station along the Y-axis [cm]
   double GetYmax(int stationId) const { return GetTrdModulePar(stationId)->GetSizeY(); }
 
-  /// Gets z component of the station position
-  /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
-  /// \return Z position of station [cm]
-  double GetZ(int stationId) const { return GetTrdModulePar(stationId)->GetZ(); }
-
   /// Check if station provides time measurements
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
   /// \return Flag: true - station provides time measurements, false - station does not provide time measurements
   bool IsTimeInfoProvided(int /*stationId*/) const { return true; }
 
+  /// Gets stereo angles of the two independent measured coordinates
+  /// The tracking does not use this method. It is only used by the QA task.
+  /// \param  address  detector unique identifier
+  /// \return [phiU, phiV] - Stereo angles [rad]
+  std::tuple<double, double> GetStereoAnglesSensor(int /*address*/) const { return std::tuple(0., TMath::Pi() / 2.); }
+
   /// FairTask: sets parameter containers up
   void SetParContainers();
 

macro/L1/configs/config_ideal_hits.yaml

+#  Copyright (C) 2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+#  SPDX-License-Identifier: GPL-3.0-only
+#  Authors: Sergei Zharko [committer]
+#
+## @file   config_ideal_hits_mcbm.yaml
+## @brief  Configuration file for ideal hit producers
+## @since  28.06.2023
+## @author Sergei Zharko <s.zharko@gsi.de>
+
+ideal_hit_producer:
+  #
+  # Flags are defined for each station
+  # 0 - real hits
+  # 1 - real hit position and time are adjusted with MC (exact quantity values are used)
+  # 2 - real hit position and time are adjusted with MC (true values are smeared within corresponding error)
+  # 3 - ideal hits are created (exact quantity values are used)
+  # 4 - ideal hits are created (true values are smeared withing errors, defined in section parameters)
+  flags:
+    sts:
+      0: 4
+      1: 4
+      2: 4
+      3: 4
+      4: 4
+      5: 4
+      6: 4
+      7: 4
+
+  #
+  # Notes:
+  # 1) For MVD, MuCh, TRD and TOF du corresponds to dx, and dv corresponds to dy
+  # 2) Spatial errors are expressed in cm, time errors are expressed in ns
+  # 3) pdf stands for probability density function
+  #
+  # Available PDFs:
+  #   g: bounded gaussian distribution
+  #   u: uniform distribution
+  parameters:
+    sts:
+      0:
+        {
+          du: { angle: 0.0, value: 15.e-4, pdf: g },
+          dv: { angle: 7.5, value: 15.e-4, pdf: g },
+          dt: { value: 2.7, pdf: g },
+        }
+      1:
+        {
+          du: { angle: 0.0, value: 15.e-4, pdf: g },
+          dv: { angle: 7.5, value: 15.e-4, pdf: g },
+          dt: { value: 2.7, pdf: g },
+        }
+      2:
+        {
+          du: { angle: 0.0, value: 15.e-4, pdf: g },
+          dv: { angle: 7.5, value: 15.e-4, pdf: g },
+          dt: { value: 2.7, pdf: g },
+        }
+      3:
+        {
+          du: { angle: 0.0, value: 15.e-4, pdf: g },
+          dv: { angle: 7.5, value: 15.e-4, pdf: g },
+          dt: { value: 2.7, pdf: g },
+        }
+      4:
+        {
+          du: { angle: 0.0, value: 15.e-4, pdf: g },
+          dv: { angle: 7.5, value: 15.e-4, pdf: g },
+          dt: { value: 2.7, pdf: g },
+        }
+      5:
+        {
+          du: { angle: 0.0, value: 15.e-4, pdf: g },
+          dv: { angle: 7.5, value: 15.e-4, pdf: g },
+          dt: { value: 2.7, pdf: g },
+        }
+      6:
+        {
+          du: { angle: 0.0, value: 15.e-4, pdf: g },
+          dv: { angle: 7.5, value: 15.e-4, pdf: g },
+          dt: { value: 2.7, pdf: g },
+        }
+      7:
+        {
+          du: { angle: 0.0, value: 15.e-4, pdf: g },
+          dv: { angle: 7.5, value: 15.e-4, pdf: g },
+          dt: { value: 2.7, pdf: g },
+        }

macro/L1/configs/config_ideal_hits_mcbm.yaml

@@ -34,9 +34,9 @@ ideal_hit_producer:
   #   u: uniform distribution
   parameters:
     sts:
-      0: { du: { value: 10.e-4, pdf: g }, dv: { value: 10.e-4, pdf: g }, dt: { value: 2.9, pdf: g }}
-      1: { du: { value: 10.e-4, pdf: g }, dv: { value: 10.e-4, pdf: g }, dt: { value: 2.9, pdf: g }}
+      0: { du: { angle: 0, value: 10.e-4, pdf: g }, dv: { angle: 7.5, value: 10.e-4, pdf: g }, dt: { value: 2.9, pdf: g }}
+      1: { du: { angle: 0, value: 10.e-4, pdf: g }, dv: { angle: 7.5, value: 10.e-4, pdf: g }, dt: { value: 2.9, pdf: g }}
     trd:
-      0: { du: { value: .5, pdf: g }, dv: { value: .5, pdf: g }, dt: { value: 10., pdf: g }}
-      1: { du: { value: .05, pdf: g }, dv: { value: 4.0, pdf: u }, dt: { value: 10., pdf: g }}
-      2: { du: { value: 4.0, pdf: u }, dv: { value: .05, pdf: g }, dt: { value: 10., pdf: g }}
+      0: { du: { angle: 0, value: .50, pdf: g }, dv: { angle: 90, value: .50, pdf: g }, dt: { value: 10., pdf: g }}
+      1: { du: { angle: 0, value: .05, pdf: g }, dv: { angle: 90, value: 4.0, pdf: u }, dt: { value: 10., pdf: g }}
+      2: { du: { angle: 0, value: 4.0, pdf: u }, dv: { angle: 90, value: .05, pdf: g }, dt: { value: 10., pdf: g }}

macro/L1/run_reco_L1global.C

@@ -371,7 +371,6 @@ void run_reco_L1global(TString input = "", Int_t nTimeSlices = -1, Int_t firstTi
       l1 = new CbmL1("L1", 0);
     }
     l1->SetGlobalMode();
-    //l1->SetUseMcHit(0, 0, 0, 1, 0);
 
     //l1->SetInputConfigName("");
     run->AddTask(l1);

macro/mcbm/mcbm_qa.C

@@ -76,7 +76,7 @@ void mcbm_qa(Int_t nEvents = 0, TString dataset = "data/mcbm_beam_2020_03_test",
   // ------------------------------------------------------------------------
 
   // -----   Some global switches   -----------------------------------------
-  if (setupName == "mcbm_beam_2022_05_23_nickel") { setup->RemoveModule(ECbmModuleId::kMuch); }
+  //if (setupName == "mcbm_beam_2022_05_23_nickel") { setup->RemoveModule(ECbmModuleId::kMuch); }
 
   //bool eventBased = !sEvBuildRaw.IsNull();
   bool bUseMvd  = setup->IsActive(ECbmModuleId::kMvd);

macro/run/run_reco.C

@@ -387,6 +387,12 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
     auto kalman = new CbmKF();
     run->AddTask(kalman);
 
+    if (debugWithMC) {
+      auto* pIdealHitProducer = new cbm::ca::IdealHitProducer("IdealHitProducer", 3);
+      pIdealHitProducer->SetConfigName(srcDir + "/macro/L1/configs/config_ideal_hits.yaml");
+      //run->AddTask(pIdealHitProducer);
+    }
+
     // L1 tracking
     auto l1 = (debugWithMC) ? new CbmL1("CA", 2, 3) : new CbmL1("CA");
 

reco/KF/CbmKF.cxx

@@ -157,12 +157,14 @@ InitStatus CbmKF::Init()
 
       tube.ID = 1101 + ist;
       //   tube.F = 1.;
-      tube.z  = mvdInterface->GetZ(ist);
-      tube.dz = mvdInterface->GetThickness(ist);
+      tube.z  = mvdInterface->GetZref(ist);
+      tube.dz = mvdInterface->GetSensorThickness(ist);
       // TODO: verify the thickness of MVD stations
       tube.RadLength  = mvdInterface->GetRadLength(ist);
-      tube.r          = mvdInterface->GetRmin(ist);
-      tube.R          = mvdInterface->GetRmax(ist);
+      tube.r          = 0.;
+      double dx       = mvdInterface->GetXmax(ist);
+      double dy       = mvdInterface->GetYmax(ist);
+      tube.R          = sqrt(dx * dx + dy * dy);
       tube.rr         = tube.r * tube.r;
       tube.RR         = tube.R * tube.R;
       tube.ZThickness = tube.dz;
@@ -191,11 +193,13 @@ InitStatus CbmKF::Init()
 
     tube.ID         = 1000 + ist;
     tube.F          = 1.;
-    tube.z          = stsInterface->GetZ(ist);
-    tube.dz         = stsInterface->GetThickness(ist);
+    tube.z          = stsInterface->GetZref(ist);
+    tube.dz         = stsInterface->GetSensorThickness(ist);
     tube.RadLength  = stsInterface->GetRadLength(ist);
-    tube.r          = stsInterface->GetRmin(ist);
-    tube.R          = stsInterface->GetRmax(ist);
+    tube.r          = 0.;
+    double dx       = stsInterface->GetXmax(ist);
+    double dy       = stsInterface->GetYmax(ist);
+    tube.R          = sqrt(dx * dx + dy * dy);
     tube.rr         = tube.r * tube.r;
     tube.RR         = tube.R * tube.R;
     tube.ZThickness = tube.dz;

reco/KF/ParticleFitter/CbmL1PFFitter.cxx

@@ -136,14 +136,14 @@ inline int CbmL1PFFitter::GetStsStationIndex(const CbmStsHit* hit)
 }
 
 
-void FilterFirst(L1Fit& fit, fvec& x, fvec& y, fvec& dxx, fvec& dxy, fvec& dyy)
+void FilterFirst(L1Fit& fit, fvec& x, fvec& y, fvec& t, L1XYMeasurementInfo& cov, fvec& dt2)
 {
   L1TrackPar& tr = fit.Tr();
-  tr.ResetErrors(dxx, dyy, 1., 1., 1., 1.e6, 1.e2);
-  tr.C10 = dxy;
+  tr.ResetErrors(cov.C00, cov.C11, 1., 1., 1., dt2, 1.e2);
+  tr.C10 = cov.C10;
   tr.x   = x;
   tr.y   = y;
-  tr.t   = 0.;
+  tr.t   = t;
   tr.vi  = 0.;
   tr.NDF = -3.0;
 }
@@ -172,24 +172,21 @@ void CbmL1PFFitter::Fit(std::vector<CbmStsTrack>& Tracks, const std::vector<CbmM
   int ista;
   const L1Station* sta = CbmL1::Instance()->fpAlgo->GetParameters()->GetStations().begin();
 
-  fvec* x   = new fvec[nHits];
-  fvec* u   = new fvec[nHits];
-  fvec* v   = new fvec[nHits];
-  fvec* t   = new fvec[nHits];
-  fvec* du2 = new fvec[nHits];
-  fvec* dv2 = new fvec[nHits];
-  fvec* dt2 = new fvec[nHits];
-  fvec* y   = new fvec[nHits];
-  fvec* z   = new fvec[nHits];
-  fmask* w  = new fmask[nHits];
+  fvec x[nHits];
+  fvec y[nHits];
+  fvec z[nHits];
+  fvec t[nHits];
+  L1XYMeasurementInfo cov[nHits];
+  fvec dt2[nHits];
+  fmask w[nHits];
 
   //  fvec y_temp;
-  fvec x_first, y_first, x_last, y_last;
-  fvec fstC00, fstC10, fstC11;
-  fvec lstC00, lstC10, lstC11;
+  fvec x_first, y_first, t_first, x_last, y_last, t_last;
+  L1XYMeasurementInfo cov_first, cov_last;
+  fvec dt2_first, dt2_last;
 
   fvec z0, z1, z2, dz, z_start, z_end;
-  L1FieldValue* fB = new L1FieldValue[nHits];
+  L1FieldValue fB[nHits];
   L1FieldValue fB_temp _fvecalignment;
 
   unsigned short N_vTracks = Tracks.size();
@@ -253,72 +250,59 @@ void CbmL1PFFitter::Fit(std::vector<CbmStsTrack>& Tracks, const std::vector<CbmM
       int nHitsTrackSts = tr[iVec]->GetNofStsHits();
       int nHitsTrack    = nHitsTrackMvd + nHitsTrackSts;
       for (i = 0; i < nHitsTrack; i++) {
-        float posx = 0.f, posy = 0.f, posz = 0.f, time = 0.;
 
+        const CbmPixelHit* hit;
         if (i < nHitsTrackMvd) {
-          int hitIndex         = tr[iVec]->GetMvdHitIndex(i);
-          const CbmMvdHit* hit = &(vMvdHits[hitIndex]);
-
-          posx = hit->GetX();
-          posy = hit->GetY();
-          posz = hit->GetZ();
-          time = hit->GetTime();
-          ista = GetMvdStationIndex(hit);
+          int hitIndex            = tr[iVec]->GetMvdHitIndex(i);
+          const CbmMvdHit* mvdHit = &(vMvdHits[hitIndex]);
+          ista                    = GetMvdStationIndex(mvdHit);
           if (ista < 0) continue;
-
-          du2[ista][iVec] = hit->GetDx() * hit->GetDx();
-          dv2[ista][iVec] = hit->GetDy() * hit->GetDy();
-          dt2[ista][iVec] = hit->GetTimeError() * hit->GetTimeError();
+          hit = mvdHit;
         }
         else {
-          int hitIndex         = tr[iVec]->GetHitIndex(i - nHitsTrackMvd);
-          const CbmStsHit* hit = &(vStsHits[hitIndex]);
-
-          posx = hit->GetX();
-          posy = hit->GetY();
-          posz = hit->GetZ();
-          time = hit->GetTime();
-          ista = GetStsStationIndex(hit);
+          int hitIndex            = tr[iVec]->GetHitIndex(i - nHitsTrackMvd);
+          const CbmStsHit* stsHit = &(vStsHits[hitIndex]);
+          ista                    = GetStsStationIndex(stsHit);
           if (ista < 0) continue;
-
-          du2[ista][iVec] = hit->GetDu() * hit->GetDu();
-          dv2[ista][iVec] = hit->GetDv() * hit->GetDv();
-          dt2[ista][iVec] = hit->GetTimeError() * hit->GetTimeError();
+          hit = stsHit;
         }
+
+        x[ista][iVec] = hit->GetX();
+        y[ista][iVec] = hit->GetY();
+        z[ista][iVec] = hit->GetZ();
+        t[ista][iVec] = hit->GetTime();
+
+        cov[ista].C00[iVec] = hit->GetDx() * hit->GetDx();
+        cov[ista].C10[iVec] = hit->GetDxy();
+        cov[ista].C11[iVec] = hit->GetDy() * hit->GetDy();
+        dt2[ista][iVec]     = hit->GetTimeError() * hit->GetTimeError();
+
         w[ista][iVec] = true;
 
-        x[ista][iVec] = posx;
-        y[ista][iVec] = posy;
-        u[ista][iVec] = posx * sta[ista].frontInfo.cos_phi[0] + posy * sta[ista].frontInfo.sin_phi[0];
-        v[ista][iVec] = posx * sta[ista].backInfo.cos_phi[0] + posy * sta[ista].backInfo.sin_phi[0];
-        z[ista][iVec] = posz;
-        t[ista][iVec] = time;
 
         sta[ista].fieldSlice.GetFieldValue(x[ista], y[ista], fB_temp);
         fB[ista].x[iVec] = fB_temp.x[iVec];
         fB[ista].y[iVec] = fB_temp.y[iVec];
         fB[ista].z[iVec] = fB_temp.z[iVec];
         if (i == 0) {
-          z_start[iVec] = posz;
-          x_first[iVec] = x[ista][iVec];
-          y_first[iVec] = y[ista][iVec];
-
-          auto [dxx, dxy, dyy] = sta[ista].FormXYCovarianceMatrix((fscal) du2[ista][iVec], (fscal) dv2[ista][iVec]);
-
-          fstC00[iVec] = dxx;
-          fstC10[iVec] = dxy;
-          fstC11[iVec] = dyy;
+          z_start[iVec]       = z[ista][iVec];
+          x_first[iVec]       = x[ista][iVec];
+          y_first[iVec]       = y[ista][iVec];
+          t_first[iVec]       = t[ista][iVec];
+          cov_first.C00[iVec] = cov[ista].C00[iVec];
+          cov_first.C10[iVec] = cov[ista].C10[iVec];
+          cov_first.C11[iVec] = cov[ista].C11[iVec];
+          dt2_first[iVec]     = dt2[ista][iVec];
         }
         if (i == nHitsTrack - 1) {
-          z_end[iVec]  = posz;
-          x_last[iVec] = x[ista][iVec];
-          y_last[iVec] = y[ista][iVec];
-
-          auto [dxx, dxy, dyy] = sta[ista].FormXYCovarianceMatrix((fscal) du2[ista][iVec], (fscal) dv2[ista][iVec]);
-
-          lstC00[iVec] = dxx;
-          lstC10[iVec] = dxy;
-          lstC11[iVec] = dyy;
+          z_end[iVec]        = z[ista][iVec];
+          x_last[iVec]       = x[ista][iVec];
+          y_last[iVec]       = y[ista][iVec];
+          t_last[iVec]       = t[ista][iVec];
+          cov_last.C00[iVec] = cov[ista].C00[iVec];
+          cov_last.C10[iVec] = cov[ista].C10[iVec];
+          cov_last.C11[iVec] = cov[ista].C11[iVec];
+          dt2_last[iVec]     = dt2[ista][iVec];
         }
       }
     }
@@ -327,7 +311,7 @@ void CbmL1PFFitter::Fit(std::vector<CbmStsTrack>& Tracks, const std::vector<CbmM
 
     i = 0;
 
-    FilterFirst(fit, x_first, y_first, fstC00, fstC10, fstC11);
+    FilterFirst(fit, x_first, y_first, t_first, cov_first, dt2_first);
     fit.SetQp0(fit.Tr().qp);
 
     z1 = z[i];
@@ -354,8 +338,7 @@ void CbmL1PFFitter::Fit(std::vector<CbmStsTrack>& Tracks, const std::vector<CbmM
       fit.EnergyLossCorrection(radThick, -fvec::One());
 
       fit.SetMask(initialised && w[i]);
-      fit.Filter(sta[i].frontInfo, u[i], du2[i]);
-      fit.Filter(sta[i].backInfo, v[i], dv2[i]);
+      fit.FilterXY(cov[i], x[i], y[i]);
       fit.FilterTime(t[i], dt2[i], sta[i].timeInfo);
 
       b2 = b1;
@@ -398,7 +381,7 @@ void CbmL1PFFitter::Fit(std::vector<CbmStsTrack>& Tracks, const std::vector<CbmM
 
     i = nHits - 1;
 
-    FilterFirst(fit, x_last, y_last, lstC00, lstC10, lstC11);
+    FilterFirst(fit, x_last, y_last, t_last, cov_last, dt2_last);
 
     z1 = z[i];
     sta[i].fieldSlice.GetFieldValue(T.x, T.y, b1);
@@ -425,8 +408,7 @@ void CbmL1PFFitter::Fit(std::vector<CbmStsTrack>& Tracks, const std::vector<CbmM
       fit.EnergyLossCorrection(radThick, fvec::One());
 
       fit.SetMask(initialised && w[i]);
-      fit.Filter(sta[i].frontInfo, u[i], du2[i]);
-      fit.Filter(sta[i].backInfo, v[i], dv2[i]);
+      fit.FilterXY(cov[i], x[i], y[i]);
       fit.FilterTime(t[i], dt2[i], sta[i].timeInfo);
 
       b2 = b1;
@@ -465,14 +447,6 @@ void CbmL1PFFitter::Fit(std::vector<CbmStsTrack>& Tracks, const std::vector<CbmM
       tr[iVec]->SetNDF(static_cast<int>(T.NDF[iVec]));
     }
   }
-
-  delete[] x;
-  delete[] u;
-  delete[] v;
-  delete[] y;
-  delete[] z;
-  delete[] w;
-  delete[] fB;
 }
 
 void CbmL1PFFitter::Fit(vector<CbmStsTrack>& Tracks, const vector<int>& pidHypo)

reco/L1/CMakeLists.txt

@@ -66,6 +66,8 @@ set(SRCS
   L1Algo/utils/L1AlgoDraw.cxx
   L1Algo/utils/L1AlgoEfficiencyPerformance.cxx
   L1Algo/utils/L1AlgoPulls.cxx
+  L1Algo/utils/CaUvConverter.cxx
+
   catools/CaToolsMCData.cxx
   catools/CaToolsMCPoint.cxx
   catools/CaToolsMCTrack.cxx
@@ -77,7 +79,6 @@ set(SRCS
 
   qa/CbmTrackerInputQaTrd.cxx
   qa/CbmTrackerInputQaTof.cxx
-  qa/CbmTrackingInputQaSts.cxx
   qa/CbmCaInputQaSts.cxx
   qa/CbmCaInputQaMuch.cxx
   qa/CbmCaInputQaTrd.cxx
@@ -108,6 +109,7 @@ set(HEADERS
   L1Algo/L1Vector.h
   L1Algo/L1EArray.h
   L1Algo/L1Undef.h
+  L1Algo/utils/CaUvConverter.h
   catools/CaToolsWindowFinder.h
   catools/CaToolsLinkKey.h
   catools/CaToolsHitRecord.h
@@ -215,6 +217,7 @@ install(FILES CbmL1Counters.h
   L1Algo/L1Track.h
   utils/CbmCaIdealHitProducer.h
   utils/CbmCaIdealHitProducerDet.h
+  L1Algo/utils/CaUvConverter.cxx
   qa/CbmCaInputQaBase.h
   DESTINATION include
 )