Use extra ITS error on the ioutils::convertCompactClusters level

Author: shahor02

Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITS.h

@@ -52,6 +52,7 @@
 #include "CommonDataFormat/FlatHisto2D.h"
 #include "DataFormatsITSMFT/TopologyDictionary.h"
 #include "DataFormatsITSMFT/TrkClusRef.h"
+#include "ITSMFTReconstruction/ChipMappingITS.h"
 
 class TTree;
 
@@ -561,6 +562,8 @@ class MatchTPCITS
   std::array<int16_t, o2::constants::lhc::LHCMaxBunches> mClosestBunchAbove; // closest filled bunch from above
   std::array<int16_t, o2::constants::lhc::LHCMaxBunches> mClosestBunchBelow; // closest filled bunch from below
 
+  const o2::itsmft::ChipMappingITS ITSChMap{};
+
   const o2::globaltracking::RecoContainer* mRecoCont = nullptr;
   ///>>>------ these are input arrays which should not be modified by the matching code
   //           since this info is provided by external device

Detectors/GlobalTracking/include/GlobalTracking/MatchTPCITSParams.h

@@ -62,6 +62,12 @@ struct MatchTPCITSParams : public o2::conf::ConfigurableParamHelper<MatchTPCITSP
   int nBinsTglVDriftCalib = 50;    ///< number of bins in reference ITS tgl for VDrift calibration
   int nBinsDTglVDriftCalib = 100;  ///< number of bins in delta tgl for VDrift calibration
 
+  float itsIBErrY2 = 0.; ///< systematic error^2 in Y for ITS for IB
+  float itsIBErrZ2 = 0.; ///< systematic error^2 in Z for ITS for IB
+
+  float itsOBErrY2 = 0.; ///< systematic error^2 in Y for ITS for OB
+  float itsOBErrZ2 = 0.; ///< systematic error^2 in Z for ITS for OB
+
   //___________________ AfterBurner params
   int requireToReachLayerAB = 5;   ///< AB tracks should reach at least this layer from above
   int lowestLayerAB = 0;           ///< lowest layer to reach in AfterBurner

Detectors/ITSMFT/ITS/tracking/CMakeLists.txt

@@ -33,6 +33,7 @@ o2_add_library(ITStracking
                                      O2::DataFormatsITSMFT
                                      O2::SimulationDataFormat
                                      O2::ITSBase
+                                     O2::ITSMFTReconstruction
                                      O2::DataFormatsITS)
 
 o2_target_root_dictionary(ITStracking

Detectors/ITSMFT/ITS/tracking/include/ITStracking/IOUtils.h

@@ -26,8 +26,10 @@
 #include "ITStracking/ROframe.h"
 #include "ITStracking/Label.h"
 #include "ITStracking/Road.h"
+#include "ITStracking/TrackingConfigParam.h"
 #include "ITSMFTBase/SegmentationAlpide.h"
 #include "ReconstructionDataFormats/BaseCluster.h"
+#include "ITSMFTReconstruction/ChipMappingITS.h"
 
 namespace o2
 {
@@ -68,6 +70,12 @@ void convertCompactClusters(gsl::span<const itsmft::CompClusterExt> clusters,
                             std::vector<o2::BaseCluster<float>>& output,
                             const itsmft::TopologyDictionary& dict);
 
+inline static const o2::itsmft::ChipMappingITS& getChipMappingITS()
+{
+  static const o2::itsmft::ChipMappingITS MP;
+  return MP;
+}
+
 std::vector<std::unordered_map<int, Label>> loadLabels(const int, const std::string&);
 void writeRoadsReport(std::ofstream&, std::ofstream&, std::ofstream&, const std::vector<std::vector<Road>>&,
                       const std::unordered_map<int, Label>&);

Detectors/ITSMFT/ITS/tracking/include/ITStracking/TrackingConfigParam.h

@@ -40,7 +40,8 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
 
   // Use TGeo for mat. budget
   bool useMatCorrTGeo = false;
-  float misalignment[7] = {-1.f, -1.f, -1.f, -1.f, -1.f, -1.f, -1.f};
+  float sysErrY2[7] = {0}; // systematic error^2 in Y per layer
+  float sysErrZ2[7] = {0}; // systematic error^2 in Z per layer
   float nSigmaCut = -1.f;
   float deltaTanLres = -1.f;
   float phiCut = -1.f;
@@ -55,4 +56,4 @@ struct TrackerParamConfig : public o2::conf::ConfigurableParamHelper<TrackerPara
 
 } // namespace its
 } // namespace o2
-#endif
+#endif

Detectors/ITSMFT/ITS/tracking/src/IOUtils.cxx

@@ -56,6 +56,16 @@ void ioutils::convertCompactClusters(gsl::span<const itsmft::CompClusterExt> clu
                                      const itsmft::TopologyDictionary& dict)
 {
   GeometryTGeo* geom = GeometryTGeo::Instance();
+  bool applyMisalignment = false;
+  const auto& conf = TrackerParamConfig::Instance();
+  const auto& chmap = getChipMappingITS();
+  for (int il = 0; il < chmap.NLayers; il++) {
+    if (conf.sysErrY2[il] > 0.f || conf.sysErrZ2[il] > 0.f) {
+      applyMisalignment = true;
+      break;
+    }
+  }
+
   for (auto& c : clusters) {
     auto pattID = c.getPatternID();
     o2::math_utils::Point3D<float> locXYZ;
@@ -74,6 +84,11 @@ void ioutils::convertCompactClusters(gsl::span<const itsmft::CompClusterExt> clu
       locXYZ = dict.getClusterCoordinates(c, patt, false);
     }
     auto& cl3d = output.emplace_back(c.getSensorID(), geom->getMatrixT2L(c.getSensorID()) ^ locXYZ); // local --> tracking
+    if (applyMisalignment) {
+      auto lrID = chmap.getLayer(c.getSensorID());
+      sigmaY2 += conf.sysErrY2[lrID];
+      sigmaZ2 += conf.sysErrZ2[lrID];
+    }
     cl3d.setErrors(sigmaY2, sigmaZ2, sigmaYZ);
   }
 }

Detectors/ITSMFT/ITS/tracking/src/Tracker.cxx

@@ -650,7 +650,7 @@ void Tracker::getGlobalConfiguration()
   for (auto& params : mTrkParams) {
     if (params.NLayers == 7) {
       for (int i{0}; i < 7; ++i) {
-        params.LayerMisalignment[i] = tc.misalignment[i] > 0 ? tc.misalignment[i] : params.LayerMisalignment[i];
+        params.LayerMisalignment[i] = tc.sysErrZ2[i] > 0 ? std::sqrt(tc.sysErrZ2[i]) : params.LayerMisalignment[i];
       }
     }
     params.PhiBins = tc.LUTbinsPhi > 0 ? tc.LUTbinsPhi : params.PhiBins;

Detectors/ITSMFT/common/reconstruction/include/ITSMFTReconstruction/ChipMappingITS.h

@@ -229,6 +229,20 @@ class ChipMappingITS
     return sid + ruOnLr;
   }
 
+  static constexpr int getLayer(int chipSW)
+  {
+    int i = 0;
+    do {
+      if (chipSW < FirstChipsOnLr[i]) {
+        break;
+      }
+    } while (++i < NLayers);
+    return i;
+  }
+
+  static constexpr int getNChipsOnLayer(int lr) { return NChipsOnLr[lr]; }
+  static constexpr int getFirstChipsOnLayer(int lr) { return FirstChipsOnLr[lr]; }
+
   // sub-barrel types, their number, N layers, Max N GBT Links per RU
   static constexpr int IB = 0, MB = 1, OB = 2, NSubB = 3, NLayers = 7, NLinks = 3;
 
@@ -256,6 +270,12 @@ class ChipMappingITS
   ///< number of staves per layer
   static constexpr std::array<int, NLayers> FirstStaveOnLr = {0, 12, 28, 48, 72, 102, 144};
 
+  ///< number of chips per layer
+  static constexpr std::array<int, NLayers> NChipsOnLr = {108, 144, 180, 2688, 3360, 8232, 144};
+
+  ///< 1st chipID on layer
+  static constexpr std::array<int, NLayers> FirstChipsOnLr = {0, 108, 252, 432, 3120, 6480, 9408};
+
   ///< RU types for each layer
   static constexpr std::array<uint8_t, NLayers> RUTypeLr = {IB, IB, IB, MB, MB, OB, OB};