Merge branch 'AliceO2Group:dev' into cpu-hip-filter

Author: fweig

CODEOWNERS

@@ -73,7 +73,7 @@
 /Detectors/TPC                     @davidrohr @wiechula @shahor02
 /Detectors/TRD                     @f3sch @bazinski @wille10
 /Detectors/Upgrades                @mconcas
-/Detectors/Upgrades/ALICE3         @mconcas @njacazio @fcolamar
+/Detectors/Upgrades/ALICE3         @mconcas @njacazio @fcolamar @pbutti
 /Detectors/Upgrades/ITS3           @fgrosa @arossi81 @mconcas @f3sch
 /Detectors/ZDC                     @coppedis @cortesep
 /Detectors/CTF                     @shahor02

Common/Field/CMakeLists.txt

@@ -16,6 +16,7 @@ o2_add_library(Field
                        src/MagFieldParam.cxx
                        src/MagneticField.cxx
                        src/MagneticWrapperChebyshev.cxx
+                       src/FieldOriginBiasParam.cxx
                        src/ALICE3MagneticField.cxx
                        PUBLIC_LINK_LIBRARIES O2::MathUtils FairRoot::Base O2::CommonUtils)
 
@@ -26,6 +27,7 @@ o2_target_root_dictionary(Field
                                   include/Field/MagFieldContFact.h
                                   include/Field/MagFieldFast.h
                                   include/Field/MagFieldFact.h
+                                  include/Field/FieldOriginBiasParam.h
                                   include/Field/ALICE3MagneticField.h)
 
 o2_add_test(MagneticField

Common/Field/include/Field/FieldOriginBiasParam.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 the origin of the magnetic field
+
+#ifndef ALICEO2_FIELDORIGIN_BIAS_PARAM_H
+#define ALICEO2_FIELDORIGIN_BIAS_PARAM_H
+
+#include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/ConfigurableParamHelper.h"
+
+namespace o2
+{
+namespace field
+{
+
+struct FieldOriginBiasParam : public o2::conf::ConfigurableParamHelper<FieldOriginBiasParam> {
+  double x = 0.;
+  double y = 0.;
+  double z = 0.;
+
+  O2ParamDef(FieldOriginBiasParam, "FieldOriginBias");
+};
+
+} // namespace field
+} // end namespace o2
+
+#endif

Common/Field/include/Field/MagneticField.h

@@ -32,6 +32,7 @@ namespace o2
 namespace field
 {
 class MagneticWrapperChebyshev;
+class FieldOriginBiasParam;
 }
 } // namespace o2
 namespace o2
@@ -249,6 +250,7 @@ class MagneticField : public FairField
   void setBeamType(MagFieldParam::BeamType_t type) { mBeamType = type; }
 
   void setBeamEnergy(float energy) { mBeamEnergy = energy; }
+  void checkOriginBias();
 
  private:
   std::unique_ptr<MagneticWrapperChebyshev> mMeasuredMap; //! Measured part of the field map
@@ -273,6 +275,8 @@ class MagneticField : public FairField
 
   TNamed mParameterNames; ///< file and parameterization loaded
 
+  static const FieldOriginBiasParam* gOriginBias;
+
   static const Double_t sSolenoidToDipoleZ;  ///< conventional Z of transition from L3 to Dipole field
   static const UShort_t sPolarityConvention; ///< convention for the mapping of the curr.sign on main component sign
 

Common/Field/src/FieldLinkDef.h

@@ -22,4 +22,7 @@
 #pragma link C++ class o2::field::MagFieldFast + ;
 #pragma link C++ class o2::field::ALICE3MagneticField + ;
 
+#pragma link C++ class o2::field::FieldOriginBiasParam + ;
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::field::FieldOriginBiasParam> + ;
+
 #endif

Common/Field/src/FieldOriginBiasParam.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 the origin of the magnetic field
+
+#include "Field/FieldOriginBiasParam.h"
+
+O2ParamImpl(o2::field::FieldOriginBiasParam);

Common/Field/src/MagneticField.cxx

@@ -14,6 +14,7 @@
 /// \author ruben.shahoyan@cern.ch
 
 #include "Field/MagneticField.h"
+#include "Field/FieldOriginBiasParam.h"
 #include <TFile.h>             // for TFile
 #include <TPRegexp.h>          // for TPRegexp
 #include <TString.h>           // for TString
@@ -27,6 +28,8 @@ using namespace o2::field;
 
 ClassImp(MagneticField);
 
+const FieldOriginBiasParam* MagneticField::gOriginBias = nullptr;
+
 const Double_t MagneticField::sSolenoidToDipoleZ = -700.;
 
 /// Explanation for polarity conventions: these are the mapping between the
@@ -88,6 +91,9 @@ MagneticField::MagneticField()
    * Default constructor
    */
   fType = 2; // flag non-constant field
+  if (!gOriginBias) {
+    checkOriginBias();
+  }
 }
 
 MagneticField::MagneticField(const char* name, const char* title, Double_t factorSol, Double_t factorDip,
@@ -116,8 +122,10 @@ MagneticField::MagneticField(const char* name, const char* title, Double_t facto
   /*
    * Constructor for human readable params
    */
-
   setDataFileName(path.c_str());
+  if (!gOriginBias) {
+    checkOriginBias();
+  }
   CreateField();
 }
 
@@ -145,8 +153,10 @@ MagneticField::MagneticField(const MagFieldParam& param)
   /*
    * Constructor for FairParam derived params
    */
-
   setDataFileName(param.GetMapPath());
+  if (!gOriginBias) {
+    checkOriginBias();
+  }
   CreateField();
 }
 
@@ -261,12 +271,12 @@ Bool_t MagneticField::loadParameterization()
   return kTRUE;
 }
 
-void MagneticField::Field(const Double_t* __restrict__ xyz, Double_t* __restrict__ b)
+void MagneticField::Field(const Double_t* __restrict__ xyzExt, Double_t* __restrict__ b)
 {
   /*
    * query field value at point
    */
-
+  double xyz[3] = {xyzExt[0] - gOriginBias->x, xyzExt[1] - gOriginBias->y, xyzExt[2] - gOriginBias->z};
   //  b[0]=b[1]=b[2]=0.0;
   if (mFastField && mFastField->Field(xyz, b)) {
     return;
@@ -288,12 +298,12 @@ void MagneticField::Field(const Double_t* __restrict__ xyz, Double_t* __restrict
   }
 }
 
-Double_t MagneticField::getBz(const Double_t* xyz) const
+Double_t MagneticField::getBz(const Double_t* xyzExt) const
 {
   /*
    * query field Bz component at point
    */
-
+  double xyz[3] = {xyzExt[0] - gOriginBias->x, xyzExt[1] - gOriginBias->y, xyzExt[2] - gOriginBias->z};
   if (mFastField) {
     double bz = 0;
     if (mFastField->GetBz(xyz, bz)) {
@@ -728,3 +738,14 @@ void MagneticField::AllowFastField(bool v)
     mFastField.reset(nullptr);
   }
 }
+
+//_____________________________________________________________________________
+void MagneticField::checkOriginBias()
+{
+  // posibility to globally bias all data members with the proper env.var
+  if (const auto* biasString = std::getenv("O2_DPL_FIELDORIGINBIAS"); biasString && *biasString) {
+    o2::conf::ConfigurableParam::updateFromString(biasString);
+  }
+  gOriginBias = &FieldOriginBiasParam::Instance();
+  LOGP(info, "Field origin is set to: XYZ: {:.4f},{:.4f},{:.4f}", gOriginBias->x, gOriginBias->y, gOriginBias->z);
+}

Common/ML/src/OrtInterface.cxx

@@ -140,6 +140,9 @@ void OrtModel::initEnvironment()
 
 void OrtModel::initSessionFromBuffer(const char* buffer, size_t bufferSize)
 {
+  if (mAllocateDeviceMemory) {
+    memoryOnDevice(mDeviceId);
+  }
   mPImplOrt->sessionOptions.AddConfigEntry("session.load_model_format", "ONNX");
   mPImplOrt->sessionOptions.AddConfigEntry("session.use_ort_model_bytes_directly", "1");
 

DataFormats/Calibration/include/DataFormatsCalibration/MeanVertexObject.h

@@ -110,6 +110,7 @@ class MeanVertexObject : public VertexBase
 
   void setMeanXYVertexAtZ(VertexBase& v, float z) const
   {
+    v = *this;
     v.setX(getXAtZ(z));
     v.setY(getYAtZ(z));
     v.setZ(z);

DataFormats/Detectors/TPC/include/DataFormatsTPC/ClusterNative.h

@@ -73,28 +73,21 @@ struct ClusterNative {
   uint8_t sigmaTimePacked;  //< Sigma of the time in packed format
   uint8_t sigmaPadPacked;   //< Sigma of the pad in packed format
   uint16_t qMax;            //< QMax of the cluster
-  uint16_t qTot;            //< Total charge of the cluster
+  uint16_t qTotPacked;      //< Total charge of the cluster
 
   GPUd() static uint16_t packPad(float pad) { return (uint16_t)(pad * scalePadPacked + 0.5); }
   GPUd() static uint32_t packTime(float time) { return (uint32_t)(time * scaleTimePacked + 0.5); }
   GPUd() static float unpackPad(uint16_t pad) { return float(pad) * (1.f / scalePadPacked); }
   GPUd() static float unpackTime(uint32_t time) { return float(time) * (1.f / scaleTimePacked); }
 
   GPUdDefault() ClusterNative() = default;
-  GPUd() ClusterNative(uint32_t time, uint8_t flags, uint16_t pad, uint8_t sigmaTime, uint8_t sigmaPad, uint16_t qmax, uint16_t qtot) : padPacked(pad), sigmaTimePacked(sigmaTime), sigmaPadPacked(sigmaPad), qMax(qmax), qTot(qtot)
+  GPUd() ClusterNative(uint32_t time, uint8_t flags, uint16_t pad, uint8_t sigmaTime, uint8_t sigmaPad, uint16_t qmax, uint16_t qtotPacked) : padPacked(pad), sigmaTimePacked(sigmaTime), sigmaPadPacked(sigmaPad), qMax(qmax), qTotPacked(qtotPacked)
   {
     setTimePackedFlags(time, flags);
   }
 
   GPUd() uint16_t getQmax() const { return qMax; }
-  GPUd() uint16_t getQtot() const
-  {
-    if (isSaturated()) [[unlikely]] {
-      auto sQtot = getSaturatedQtot();
-      return sQtot < USHRT_MAX ? sQtot : USHRT_MAX;
-    }
-    return qTot;
-  }
+  GPUd() uint32_t getQtot() const { return isSaturated() ? getSaturatedQtot() : (uint32_t)qTotPacked; }
   GPUd() uint8_t getFlags() const { return timeFlagsPacked >> 24; }
   GPUd() uint32_t getTimePacked() const { return timeFlagsPacked & 0xFFFFFF; }
   GPUd() void setTimePackedFlags(uint32_t timePacked, uint8_t flags)
@@ -155,19 +148,19 @@ struct ClusterNative {
     sigmaPadPacked = tmp;
   }
 
-  GPUd() bool isSaturated() const { return qTot > maxRegularQtot; }
+  GPUd() bool isSaturated() const { return qTotPacked > maxRegularQtot; }
 
   GPUd() void setSaturatedQtot(uint32_t qtot)
   {
-    this->qTot = USHRT_MAX;
+    this->qTotPacked = USHRT_MAX;
     if (qtot < maxSaturatedQtot) {
-      this->qTot = ((qtot + scaleSaturatedQtot / 2) / scaleSaturatedQtot) + maxRegularQtot;
+      this->qTotPacked = ((qtot + scaleSaturatedQtot / 2) / scaleSaturatedQtot) + maxRegularQtot;
     }
   }
 
   GPUd() uint32_t getSaturatedQtot() const
   {
-    return uint32_t(qTot - maxRegularQtot) * scaleSaturatedQtot;
+    return uint32_t(qTotPacked - maxRegularQtot) * scaleSaturatedQtot;
   }
 
   GPUd() void setSaturatedTailLength(uint32_t tail)
@@ -192,8 +185,8 @@ struct ClusterNative {
       return (this->sigmaPadPacked < rhs.sigmaPadPacked);
     } else if (this->qMax != rhs.qMax) {
       return (this->qMax < rhs.qMax);
-    } else if (this->qTot != rhs.qTot) {
-      return (this->qTot < rhs.qTot);
+    } else if (this->qTotPacked != rhs.qTotPacked) {
+      return (this->getQtot() < rhs.getQtot());
     } else {
       return (this->getFlags() < rhs.getFlags());
     }
@@ -206,7 +199,7 @@ struct ClusterNative {
            this->sigmaTimePacked == rhs.sigmaTimePacked &&
            this->sigmaPadPacked == rhs.sigmaPadPacked &&
            this->qMax == rhs.qMax &&
-           this->qTot == rhs.qTot &&
+           this->qTotPacked == rhs.qTotPacked &&
            this->getFlags() == rhs.getFlags();
   }