align

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

Detectors/Upgrades/ITS3/alignment/CMakeLists.txt

@@ -21,6 +21,7 @@ o2_add_library(ITS3Align
                                      O2::Steer
                                      O2::ITSBase
                                      O2::ITSMFTSimulation
+                                     O2::ITS3Reconstruction
                                      O2::Framework
                                      O2::GlobalTrackingWorkflowReaders
                                      O2::GlobalTrackingWorkflowHelpers

Detectors/Upgrades/ITS3/alignment/include/ITS3Align/AlignmentParams.h

@@ -27,19 +27,22 @@ struct AlignmentParams : public o2::conf::ConfigurableParamHelper<AlignmentParam
   double maxSnp = 0.85;
   double maxStep = 2.0;
   // o2::base::PropagatorD::MatCorrType matCorrType = o2::base::PropagatorD::MatCorrType::USEMatCorrTGeo;
-  o2::base::PropagatorD::MatCorrType matCorrType = o2::base::PropagatorD::MatCorrType::USEMatCorrLUT;
+  o2::base::PropagatorD::MatCorrType corrType = o2::base::PropagatorD::MatCorrType::USEMatCorrLUT;
 
-  bool useStableRefit = true; // use input tracks as linearization point
-  float minMS = 1e-6f;        //  minimum scattering to account for
-  float maxChi2Ndf = 10;      // maximum Chi2/Ndf allowed for GBL fit
+  bool useStableRef = true; // use input tracks as linearization point
+  float minMS = 1e-6f;      //  minimum scattering to account for
+  float maxChi2Ndf = 10;    // maximum Chi2/Ndf allowed for GBL fit
+
+  float extraClsErrY[7] = {0};
+  float extraClsErrZ[7] = {0};
 
   // Ridder options
   int ridderMaxExtrap = 10;
   double ridderRelIniStep[5] = {0.01, 0.01, 0.02, 0.02, 0.02};
   double ridderMaxIniStep[5] = {0.1, 0.1, 0.05, 0.05, 0.05};
   double ridderShrinkFac = 2.0;
   double ridderEps = 1e-16;
-  double ridderMaxJacDiagTol = 0.1; // max tolerance of diagonal elements away from 1
+  double ridderMaxJacDiagTol = 0.2; // max tolerance of diagonal elements away from 1
 
   // MillePede output
   std::string milleBinFile = "mp2data.bin";

Detectors/Upgrades/ITS3/alignment/include/ITS3Align/AlignmentTypes.h

@@ -32,11 +32,8 @@ struct Measurement final {
 struct FrameInfoExt final {
   int16_t sens = -1;
   int8_t lr = -1; // -1 = vtx
-  o2::math_utils::Point3D<float> trk;
-  o2::math_utils::Point3D<float> loc;
-  o2::math_utils::Point3D<float> glo;
-  float x{-999.f};
-  float alpha{-999.f};
+  double x{-999.f};
+  double alpha{-999.f};
   std::array<double, 2> positionTrackingFrame = {999., 999.};
   std::array<double, 3> covarianceTrackingFrame = {999., 999., 999.};
 
@@ -48,7 +45,7 @@ struct FrameInfoExt final {
 struct FitInfo final {
   float chi2Ndf{-1}; // Chi2/Ndf of track refit
   float chi2{-1};    // Chi2
-  int ndf;           // ndf
+  int ndf{-1};       // ndf
   ClassDefNV(FitInfo, 1)
 };
 

Detectors/Upgrades/ITS3/alignment/src/AlignmentSensors.cxx

@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include <numbers>
+#include <format>
 
 #include <TGeoManager.h>
 #include <TGeoPhysicalNode.h>