Merge branch 'dev' into iotofdigi

maciacco · web-flow · commit 72156432a0f9 · 2026-06-24T16:52:02.000+02:00
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -34,7 +34,7 @@
 /DataFormats/Detectors/GlobalTracking          @shahor02
 /DataFormats/Detectors/GlobalTrackingWorkflow  @shahor02
 /DataFormats/Detectors/HMPID                   @gvolpe79
-/DataFormats/Detectors/ITSMFT                  @fprino @mcoquet642 @shahor02
+/DataFormats/Detectors/ITSMFT                  @f3sch @fprino @mcoquet642 @shahor02
 /DataFormats/Detectors/MUON                    @AliceO2Group/muon-experts @shahor02
 /DataFormats/Detectors/PHOS                    @peressounko @kharlov
 /DataFormats/Detectors/Passive                 @sawenzel
@@ -65,7 +65,7 @@
 /Detectors/GlobalTracking          @shahor02
 /Detectors/GlobalTrackingWorkflow  @shahor02
 /Detectors/HMPID                   @gvolpe79
-/Detectors/ITSMFT                  @fprino @mcoquet642 @mconcas @shahor02
+/Detectors/ITSMFT                  @f3sch @fprino @mcoquet642 @mconcas @shahor02
 /Detectors/MUON                    @AliceO2Group/muon-experts @shahor02
 /Detectors/PHOS                    @peressounko @kharlov
 /Detectors/Passive                 @sawenzel
diff --git a/DataFormats/Calibration/CMakeLists.txt b/DataFormats/Calibration/CMakeLists.txt
@@ -11,9 +11,12 @@
 
 o2_add_library(DataFormatsCalibration
                SOURCES src/MeanVertexObject.cxx
+               SOURCES src/MeanVertexBiasParam.cxx
                PUBLIC_LINK_LIBRARIES O2::ReconstructionDataFormats
-                                     O2::Framework)
+                                     O2::Framework
+                                     O2::CommonUtils)
 
 o2_target_root_dictionary(DataFormatsCalibration
-                          HEADERS include/DataFormatsCalibration/MeanVertexObject.h)
+                          HEADERS include/DataFormatsCalibration/MeanVertexObject.h
+                                  include/DataFormatsCalibration/MeanVertexBiasParam.h)
 
diff --git a/DataFormats/Calibration/include/DataFormatsCalibration/MeanVertexBiasParam.h b/DataFormats/Calibration/include/DataFormatsCalibration/MeanVertexBiasParam.h
@@ -0,0 +1,38 @@
+// Copyright 2019-2026 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.
+
+/// \author ruben.shahoyan@cern.ch
+
+/// parameters to bias precalibrated mean vertex, e.g after the alignment shift
+
+#ifndef ALICEO2_MEANVERTEX_BIAS_PARAM_H
+#define ALICEO2_MEANVERTEX_BIAS_PARAM_H
+
+#include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/ConfigurableParamHelper.h"
+
+namespace o2
+{
+namespace dataformats
+{
+
+struct MeanVertexBiasParam : public o2::conf::ConfigurableParamHelper<MeanVertexBiasParam> {
+  float xyz[3] = {};  // position bias
+  float slopeX = 0.f; // x slope bias
+  float slopeY = 0.f; // y slope bias
+
+  O2ParamDef(MeanVertexBiasParam, "mvbias");
+};
+
+} // namespace dataformats
+} // end namespace o2
+
+#endif
diff --git a/DataFormats/Calibration/include/DataFormatsCalibration/MeanVertexObject.h b/DataFormats/Calibration/include/DataFormatsCalibration/MeanVertexObject.h
@@ -15,31 +15,45 @@
 #include <array>
 #include "Framework/Logger.h"
 #include "ReconstructionDataFormats/Vertex.h"
+#include "DataFormatsCalibration/MeanVertexBiasParam.h"
 
 namespace o2
 {
 namespace dataformats
 {
 class MeanVertexObject : public VertexBase
 {
-
  public:
   MeanVertexObject(float x, float y, float z, float sigmax, float sigmay, float sigmaz, float slopeX, float slopeY)
   {
+    if (!gMVBias) {
+      checkExternalBias();
+    }
     setXYZ(x, y, z);
     setSigma({sigmax, sigmay, sigmaz});
     mSlopeX = slopeX;
     mSlopeY = slopeY;
   }
+
   MeanVertexObject(std::array<float, 3> pos, std::array<float, 3> sigma, float slopeX, float slopeY)
   {
+    if (!gMVBias) {
+      checkExternalBias();
+    }
     math_utils::Point3D<float> p(pos[0], pos[1], pos[2]);
     setPos(p);
     setSigma(sigma);
     mSlopeX = slopeX;
     mSlopeY = slopeY;
   }
-  MeanVertexObject() = default;
+
+  MeanVertexObject()
+  {
+    if (!gMVBias) {
+      checkExternalBias();
+    }
+  }
+
   ~MeanVertexObject() = default;
   MeanVertexObject(const MeanVertexObject& other) = default;
   MeanVertexObject(MeanVertexObject&& other) = default;
@@ -57,14 +71,28 @@ class MeanVertexObject : public VertexBase
   void setSlopeX(float val) { mSlopeX = val; }
   void setSlopeY(float val) { mSlopeY = val; }
 
-  math_utils::Point3D<float>& getPos() { return getXYZ(); }
+  // getting the cartesian coordinates and errors
+  float getX() const { return VertexBase::getX() + gMVBias->xyz[0]; }
+  float getY() const
+  {
+    return VertexBase::getY() + gMVBias->xyz[1];
+    ;
+  }
+  float getZ() const
+  {
+    return VertexBase::getZ() + gMVBias->xyz[2];
+    ;
+  }
+  float getR() const { return gpu::CAMath::Hypot(getX(), getY()); }
+
+  math_utils::Point3D<float> getXYZ() const { return {getX(), getY(), getZ()}; }
   math_utils::Point3D<float> getPos() const { return getXYZ(); }
 
-  float getSlopeX() const { return mSlopeX; }
-  float getSlopeY() const { return mSlopeY; }
+  float getSlopeX() const { return mSlopeX + gMVBias->slopeX; }
+  float getSlopeY() const { return mSlopeY + gMVBias->slopeY; }
 
-  float getXAtZ(float z) const { return getX() + mSlopeX * (z - getZ()); }
-  float getYAtZ(float z) const { return getY() + mSlopeY * (z - getZ()); }
+  float getXAtZ(float z) const { return getX() + getSlopeX() * (z - getZ()); }
+  float getYAtZ(float z) const { return getY() + getSlopeY() * (z - getZ()); }
 
   void print() const;
   std::string asString() const;
@@ -82,21 +110,24 @@ class MeanVertexObject : public VertexBase
 
   void setMeanXYVertexAtZ(VertexBase& v, float z) const
   {
-    float dz = z - getZ();
-    v.setX(getX() + mSlopeX * dz);
-    v.setY(getY() + mSlopeY * dz);
+    v.setX(getXAtZ(z));
+    v.setY(getYAtZ(z));
     v.setZ(z);
   }
 
-  const VertexBase& getMeanVertex() const
+  const VertexBase getMeanVertex() const
   {
-    return (const VertexBase&)(*this);
+    return getMeanVertex(getZ());
   }
 
+  static void checkExternalBias();
+
  private:
   float mSlopeX{0.f}; // slope of x = f(z)
   float mSlopeY{0.f}; // slope of y = f(z)
 
+  static const MeanVertexBiasParam* gMVBias;
+
   ClassDefNV(MeanVertexObject, 2);
 };
 
diff --git a/DataFormats/Calibration/src/DataFormatsCalibrationLinkDef.h b/DataFormats/Calibration/src/DataFormatsCalibrationLinkDef.h
@@ -15,6 +15,8 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ struct o2::dataformats::MeanVertexObject + ;
+#pragma link C++ class o2::dataformats::MeanVertexObject + ;
+#pragma link C++ class o2::dataformats::MeanVertexBiasParam + ;
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::dataformats::MeanVertexBiasParam> + ;
 
 #endif
diff --git a/DataFormats/Calibration/src/MeanVertexBiasParam.cxx b/DataFormats/Calibration/src/MeanVertexBiasParam.cxx
@@ -0,0 +1,18 @@
+// Copyright 2019-2026 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.
+
+/// \author ruben.shahoyan@cern.ch
+
+/// parameters to bias precalibrated mean vertex, e.g after the alignment shift
+
+#include "DataFormatsCalibration/MeanVertexBiasParam.h"
+
+O2ParamImpl(o2::dataformats::MeanVertexBiasParam);
diff --git a/DataFormats/Calibration/src/MeanVertexObject.cxx b/DataFormats/Calibration/src/MeanVertexObject.cxx
@@ -12,10 +12,13 @@
 #include "DataFormatsCalibration/MeanVertexObject.h"
 #include "TRandom.h"
 
+#include <cstdlib>
+
 namespace o2
 {
 namespace dataformats
 {
+const MeanVertexBiasParam* MeanVertexObject::gMVBias = nullptr;
 
 void MeanVertexObject::set(int icoord, float val)
 {
@@ -45,7 +48,9 @@ void MeanVertexObject::setSigma(int icoord, float val)
 
 std::string MeanVertexObject::asString() const
 {
-  return VertexBase::asString() + fmt::format(" Slopes {{{:+.4e},{:+.4e}}}", mSlopeX, mSlopeY);
+  return fmt::format("Vtx {{{:+.4e},{:+.4e},{:+.4e}}} Cov.:{{{{{:.3e}..}},{{{:.3e},{:.3e}..}},{{{:.3e},{:.3e},{:.3e}}}}} | bias: XYZ: {:.4f},{:.4f},{:.4f} SlopeXY: {:.3e},{:.3e}",
+                     getX(), getY(), getZ(), mCov[0], mCov[1], mCov[2], mCov[3], mCov[4], mCov[5],
+                     gMVBias->xyz[0], gMVBias->xyz[1], gMVBias->xyz[2], gMVBias->slopeX, gMVBias->slopeY);
 }
 
 std::ostream& operator<<(std::ostream& os, const o2::dataformats::MeanVertexObject& o)
@@ -70,5 +75,16 @@ math_utils::Point3D<float> MeanVertexObject::sample() const
   return math_utils::Point3D<float>(x, y, z);
 }
 
+void MeanVertexObject::checkExternalBias()
+{
+  // posibility to globally bias all data members with the proper env.var
+  if (const auto* biasString = std::getenv("O2_DPL_MVBIAS"); biasString && *biasString) {
+    o2::conf::ConfigurableParam::updateFromString(biasString);
+  }
+  gMVBias = &MeanVertexBiasParam::Instance();
+  LOGP(info, "Mean vertex is biased by: XYZ: {:.4f},{:.4f},{:.4f} SlopeXY: {:.3e},{:.3e}",
+       gMVBias->xyz[0], gMVBias->xyz[1], gMVBias->xyz[2], gMVBias->slopeX, gMVBias->slopeY);
+}
+
 } // namespace dataformats
 } // namespace o2
diff --git a/Detectors/TPC/calibration/include/TPCCalibration/IDCFourierTransform.h b/Detectors/TPC/calibration/include/TPCCalibration/IDCFourierTransform.h
@@ -45,17 +45,15 @@ class IDCFourierTransform : public IDCFourierTransformBase<Type>
   template <bool IsEnabled = true, typename std::enable_if<(IsEnabled && (std::is_same<Type, IDCFourierTransformBaseAggregator>::value)), int>::type = 0>
   IDCFourierTransform(const unsigned int rangeIDC = 200, const unsigned int nFourierCoefficientsStore = 200 + 2) : IDCFourierTransformAggregator(rangeIDC), mFourierCoefficients{1, nFourierCoefficientsStore}, mVal1DIDCs(sNThreads), mCoefficients(sNThreads)
   {
-    initFFTW3Members();
-  };
+  }
 
   /// constructor for  EPN type
   /// \param rangeIDC number of IDCs for each interval which will be used to calculate the fourier coefficients
   /// \param nFourierCoefficientsStore number of courier coefficients (real+imag) which will be stored (the maximum can be 'rangeIDC + 2', should be an even number when using naive FT). If less than maximum is setn the inverse fourier transform will not work.
   template <bool IsEnabled = true, typename std::enable_if<(IsEnabled && (std::is_same<Type, IDCFourierTransformBaseEPN>::value)), int>::type = 0>
   IDCFourierTransform(const unsigned int rangeIDC = 200, const unsigned int nFourierCoefficientsStore = 200 + 2) : IDCFourierTransformEPN(rangeIDC), mFourierCoefficients{1, nFourierCoefficientsStore}, mVal1DIDCs(sNThreads), mCoefficients(sNThreads)
   {
-    initFFTW3Members();
-  };
+  }
 
   // Destructor
   ~IDCFourierTransform();
@@ -72,6 +70,9 @@ class IDCFourierTransform : public IDCFourierTransformBase<Type>
     sNThreads = nThreads;
   }
 
+  /// initalizing fftw members, e.g. when changing sNThreads via setNThreads after first initialization
+  void initFFTW3Members();
+
   /// calculate fourier coefficients for one TPC side
   template <bool IsEnabled = true, typename std::enable_if<(IsEnabled && (std::is_same<Type, IDCFourierTransformBaseAggregator>::value)), int>::type = 0>
   void calcFourierCoefficients(const unsigned int timeFrames = 2000)
@@ -155,9 +156,6 @@ class IDCFourierTransform : public IDCFourierTransformBase<Type>
   /// \return returns maximum numbers of stored real/imag fourier coeffiecients
   unsigned int getNMaxCoefficients() const { return this->mRangeIDC / 2 + 1; }
 
-  /// initalizing fftw members
-  void initFFTW3Members();
-
   /// performing of ft using FFTW
   void fftwLoop(const std::vector<float>& idcOneExpanded, const std::vector<unsigned int>& offsetIndex, const unsigned int interval, const unsigned int thread);
 
diff --git a/Detectors/TPC/calibration/src/IDCFourierTransform.cxx b/Detectors/TPC/calibration/src/IDCFourierTransform.cxx
@@ -35,6 +35,8 @@ o2::tpc::IDCFourierTransform<Type>::~IDCFourierTransform()
 template <class Type>
 void o2::tpc::IDCFourierTransform<Type>::initFFTW3Members()
 {
+  mVal1DIDCs.resize(sNThreads);
+  mCoefficients.resize(sNThreads);
   for (int thread = 0; thread < sNThreads; ++thread) {
     mVal1DIDCs[thread] = fftwf_alloc_real(this->mRangeIDC);
     mCoefficients[thread] = fftwf_alloc_complex(getNMaxCoefficients());
diff --git a/Detectors/TPC/calibration/test/testO2TPCIDCFourierTransform.cxx b/Detectors/TPC/calibration/test/testO2TPCIDCFourierTransform.cxx
@@ -67,6 +67,7 @@ BOOST_AUTO_TEST_CASE(IDCFourierTransformAggregator_test)
     FtType::setNThreads(2);
 
     FtType idcFourierTransform{rangeIDC, nFourierCoeff};
+    idcFourierTransform.initFFTW3Members();
     const auto intervalsPerTF = getIntegrationIntervalsPerTF(integrationIntervals, tfs);
     idcFourierTransform.setIDCs(get1DIDCs(intervalsPerTF), intervalsPerTF);
     idcFourierTransform.setIDCs(get1DIDCs(intervalsPerTF), intervalsPerTF);
@@ -105,6 +106,7 @@ BOOST_AUTO_TEST_CASE(IDCFourierTransformEPN_test)
       const bool fft = iType == 0 ? false : true;
       FtType::setFFT(fft);
       FtType idcFourierTransform{rangeIDC, nFourierCoeff};
+      idcFourierTransform.initFFTW3Members();
       const auto intervalsPerTF = getIntegrationIntervalsPerTF(integrationIntervals, tfs);
       idcFourierTransform.setIDCs(get1DIDCs(intervalsPerTF));
       idcFourierTransform.calcFourierCoefficients();
diff --git a/Detectors/TPC/workflow/include/TPCWorkflow/TPCFourierTransformAggregatorSpec.h b/Detectors/TPC/workflow/include/TPCWorkflow/TPCFourierTransformAggregatorSpec.h
@@ -66,6 +66,9 @@ class TPCFourierTransformAggregatorSpec : public o2::framework::Task
     mEnableFFTCCDB = ic.options().get<bool>("enable-fft-CCDB");
     int nthreads = ic.options().get<int>("nthreads");
     TPCFourierTransformAggregatorSpec::IDCFType::setNThreads(nthreads);
+    for (auto& fourierTransform : mIDCFourierTransform) {
+      fourierTransform.initFFTW3Members();
+    }
     resizeBuffer(mInputLanes);
   }
 
diff --git a/Detectors/Upgrades/ALICE3/IOTOF/base/CMakeLists.txt b/Detectors/Upgrades/ALICE3/IOTOF/base/CMakeLists.txt
@@ -12,8 +12,9 @@
 o2_add_library(IOTOFBase
                SOURCES src/GeometryTGeo.cxx
                        src/IOTOFBaseParam.cxx
-               PUBLIC_LINK_LIBRARIES O2::DetectorsBase)
+               PUBLIC_LINK_LIBRARIES O2::DetectorsBase
+                                     O2::MathUtils)
 
 o2_target_root_dictionary(IOTOFBase
                HEADERS include/IOTOFBase/GeometryTGeo.h
-                       include/IOTOFBase/IOTOFBaseParam.h)
+                       include/IOTOFBase/IOTOFBaseParam.h)
diff --git a/Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/GeometryTGeo.h b/Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/GeometryTGeo.h
@@ -13,8 +13,12 @@
 #define ALICEO2_IOTOF_GEOMETRYTGEO_H
 
 #include <memory>
+#include <string>
+#include <vector>
 #include <DetectorsCommonDataFormats/DetMatrixCache.h>
 #include "DetectorsCommonDataFormats/DetID.h"
+#include <IOTOFBase/IOTOFBaseParam.h>
+#include <MathUtils/Cartesian.h>
 
 namespace o2
 {
@@ -91,8 +95,11 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
 
   int getIOTOFFirstChipIndex(int lay) const;
   int getIOTOFLayer(int index) const;
+  bool isValidIOTOFChipIndex(int index) const { return index >= 0 && index <= mLastChipIndex[1]; }
   int getIOTOFChipIndex(int lay, int sta, int mod, int chip) const;
   bool getIOTOFChipId(int index, int& lay, int& sta, int& mod, int& chip) const;
+  o2::math_utils::Point3D<float> detectorToLocal(int row, int col, int chipId) const;
+  static const ChipSpecifics& getChipSpecifics(int iotofLayer);
 
   /// Get the transformation matrix of the SENSOR (not necessary the same as the chip)
   /// for a given chip 'index' by querying the TGeoManager
@@ -159,18 +166,18 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
   static std::string sBTOFSensorName;
 
   // Inner/outer TOF
-  int mNumberOfStavesIOTOF[2];
-  int mNumberOfModulesIOTOF[2];
-  int mNumberOfChipsPerModuleIOTOF[2];
-  int mNumberOfChipsPerStaveIOTOF[2];
-  int mNumberOfChipsIOTOF[2];
-  int mLastChipIndex[2];
+  int mNumberOfStavesIOTOF[2]{};
+  int mNumberOfModulesIOTOF[2]{};
+  int mNumberOfChipsPerModuleIOTOF[2]{};
+  int mNumberOfChipsPerStaveIOTOF[2]{};
+  int mNumberOfChipsIOTOF[2]{};
+  int mLastChipIndex[2]{-1, -1};
 
   // Forward TOF
-  int mNumberOfChipsFTOF;
+  int mNumberOfChipsFTOF = 0;
 
   // Backward TOF
-  int mNumberOfChipsBTOF;
+  int mNumberOfChipsBTOF = 0;
 
   std::vector<int> sensors;
   std::vector<float> mCacheRefX;     /// cache for X of IOTOF
diff --git a/Detectors/Upgrades/ALICE3/IOTOF/base/src/GeometryTGeo.cxx b/Detectors/Upgrades/ALICE3/IOTOF/base/src/GeometryTGeo.cxx
diff --git a/Framework/Core/scripts/hyperloop-perf-server/hl_common.py b/Framework/Core/scripts/hyperloop-perf-server/hl_common.py
diff --git a/Framework/Core/scripts/hyperloop-server/hyperloop_server.py b/Framework/Core/scripts/hyperloop-server/hyperloop_server.py
diff --git a/Framework/Core/src/CommonDataProcessors.cxx b/Framework/Core/src/CommonDataProcessors.cxx

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ o2::tpc::IDCFourierTransform<Type>::~IDCFourierTransform()`
`35`	`35`	`template <class Type>`
`36`	`36`	`void o2::tpc::IDCFourierTransform<Type>::initFFTW3Members()`
`37`	`37`	`{`
	`38`	`+ mVal1DIDCs.resize(sNThreads);`
	`39`	`+ mCoefficients.resize(sNThreads);`
`38`	`40`	`for (int thread = 0; thread < sNThreads; ++thread) {`
`39`	`41`	`mVal1DIDCs[thread] = fftwf_alloc_real(this->mRangeIDC);`
`40`	`42`	`mCoefficients[thread] = fftwf_alloc_complex(getNMaxCoefficients());`