Merge branch 'AliceO2Group:dev' into new_new_geometry

Author: pkurash

.clang-format

@@ -27,6 +27,7 @@ IndentWidth:     2
 # It is broken on windows. Breaks all #include "header.h"
 ---
 Language:        Cpp
+AttributeMacros: ['GPUrestrict'] # GPU qualifier macro: GPUrestrict() is otherwise parsed as function call, e.g. 'a -> b' after it
 MaxEmptyLinesToKeep: 1
 KeepEmptyLinesAtTheStartOfBlocks: true
 NamespaceIndentation: None

.clang-format-ignore

@@ -1 +1,3 @@
 *.json
+# vendored FairRoot sources: keep upstream formatting
+Detectors/3rdparty/FairRootBase/**

CCDB/src/CcdbApi.cxx

@@ -51,6 +51,9 @@
 #include <string_view>
 #include <utility>
 #include <TAlienUserAgent.h>
+#if defined(_LIBCPP_VERSION)
+#include "Framework/DataRefUtils.h"
+#endif
 #include <unordered_set>
 #include "rapidjson/document.h"
 #include "rapidjson/writer.h"
@@ -986,6 +989,9 @@ void* CcdbApi::extractFromTFile(TFile& file, TClass const* cl, const char* what)
   if (!cl) {
     return nullptr;
   }
+#if defined(_LIBCPP_VERSION)
+  o2::framework::DataRefUtils::registerLibstdcxxStdArray(file, cl);
+#endif
   auto object = file.GetObjectChecked(what, cl);
   if (!object) {
     // it could be that object was stored with previous convention

CODEOWNERS

@@ -64,6 +64,7 @@
 /Detectors/FOCAL                   @maxrauch @iarsene @matthiasrichter
 /Detectors/Geometry                @sawenzel @shahor02
 /Detectors/GlobalTracking          @shahor02
+/Detectors/GenericTracking         @f3sch @mpuccio
 /Detectors/GlobalTrackingWorkflow  @shahor02
 /Detectors/HMPID                   @gvolpe79
 /Detectors/ITSMFT                  @f3sch @fprino @mcoquet642 @mconcas @shahor02

Common/Field/CMakeLists.txt

@@ -10,23 +10,17 @@
 # or submit itself to any jurisdiction.
 
 o2_add_library(Field
-               SOURCES src/MagFieldContFact.cxx
-                       src/MagFieldFact.cxx
-                       src/MagFieldFast.cxx
-                       src/MagFieldParam.cxx
+               SOURCES src/MagFieldFast.cxx
                        src/MagneticField.cxx
                        src/MagneticWrapperChebyshev.cxx
                        src/FieldOriginBiasParam.cxx
                        src/ALICE3MagneticField.cxx
-                       PUBLIC_LINK_LIBRARIES O2::MathUtils FairRoot::Base O2::CommonUtils)
+                       PUBLIC_LINK_LIBRARIES O2::MathUtils O2::FairRootBase O2::CommonUtils)
 
 o2_target_root_dictionary(Field
                           HEADERS include/Field/MagneticWrapperChebyshev.h
                                   include/Field/MagneticField.h
-                                  include/Field/MagFieldParam.h
-                                  include/Field/MagFieldContFact.h
                                   include/Field/MagFieldFast.h
-                                  include/Field/MagFieldFact.h
                                   include/Field/FieldOriginBiasParam.h
                                   include/Field/ALICE3MagneticField.h)
 

Common/Field/include/Field/MagFieldContFact.h

@@ -10,27 +10,24 @@
 // or submit itself to any jurisdiction.
 
 /// \file MagFieldParam.h
-/// \brief Definition of the MagFieldParam: container for ALICE mag. field parameters
+/// \brief Definition of the MagFieldParam: ALICE mag. field type enumerations
 /// \author ruben.shahoyan@cern.ch
 
 #ifndef ALICEO2_FIELD_MAGFIELDPARAM_H_
 #define ALICEO2_FIELD_MAGFIELDPARAM_H_
 
-#include "FairParGenericSet.h"
-#include <TString.h>
-
-class FairParamList;
-
 namespace o2
 {
 namespace field
 {
 
-class MagneticField;
-
-class MagFieldParam : public FairParGenericSet
-{
- public:
+/// Field map and beam type enumerations.
+///
+/// This used to be a FairParGenericSet container written into the FairRoot
+/// runtime database. That path was never populated nor read back in production
+/// (field settings come from CCDB/SimConfig via SimFieldUtils), so only the
+/// enumerations - which are used throughout O2 - are kept.
+struct MagFieldParam {
   enum BMap_t {
     k2kG,
     k5kG,
@@ -44,35 +41,8 @@ class MagFieldParam : public FairParGenericSet
     kBeamTypepA,
     kBeamTypeAp
   };
-
-  MagFieldParam(const char* name = "", const char* title = "", const char* context = "");
-
-  void SetParam(const MagneticField* field);
-
-  BMap_t GetMapType() const { return mMapType; }
-  BeamType_t GetBeamType() const { return mBeamType; }
-  Int_t GetDefInt() const { return mDefaultIntegration; }
-  Double_t GetFactorSol() const { return mFactorSol; }
-  Double_t GetFactorDip() const { return mFactorDip; }
-  Double_t GetBeamEnergy() const { return mBeamEnergy; }
-  Double_t GetMaxField() const { return mMaxField; }
-  const char* GetMapPath() const { return mMapPath.Data(); }
-
-  void putParams(FairParamList* list) override;
-  Bool_t getParams(FairParamList* list) override;
-
- private:
-  BMap_t mMapType;           ///< map type ID
-  BeamType_t mBeamType;      ///< beam type ID
-  Int_t mDefaultIntegration; ///< field integration type for MC
-  Double_t mFactorSol;       ///< solenoid current factor
-  Double_t mFactorDip;       ///< dipole current factor
-  Double_t mBeamEnergy;      ///< beam energy
-  Double_t mMaxField;        ///< max field for geant
-  TString mMapPath;          ///< path to map file
-
-  ClassDefOverride(MagFieldParam, 1);
 };
+
 } // namespace field
 } // namespace o2
 

Common/Field/include/Field/MagFieldFact.h

@@ -25,8 +25,6 @@
 #include "TNamed.h" // for TNamed
 #include <memory>   // for str::unique_ptr
 
-class FairParamList;
-
 namespace o2
 {
 namespace field
@@ -63,8 +61,6 @@ class MagneticField : public FairField
                 MagFieldParam::BeamType_t btype = MagFieldParam::kBeamTypepp, Double_t benergy = -1, Int_t integ = 2,
                 Double_t fmax = 15, const std::string path = "$(O2_ROOT)/share/Common/maps/mfchebKGI_sym.root");
 
-  MagneticField(const MagFieldParam& param);
-
   MagneticField& operator=(const MagneticField& src);
 
   /// Default destructor
@@ -147,9 +143,6 @@ class MagneticField : public FairField
   /// 3d field query alias for Alias Method to calculate the field at point xyz
   void GetBxyz(const Double_t p[3], Double_t* b) override { MagneticField::Field(p, b); }
 
-  /// Fill Paramater
-  void FillParContainer() override;
-
   /// Method to calculate the integral_0^z of br,bt,bz
   void getTPCIntegral(const Double_t* xyz, Double_t* b) const;
 

Common/Field/include/Field/MagFieldParam.h

@@ -16,9 +16,6 @@
 
 #pragma link C++ class o2::field::MagneticField + ;
 #pragma link C++ class o2::field::MagneticWrapperChebyshev + ;
-#pragma link C++ class o2::field::MagFieldParam + ;
-#pragma link C++ class o2::field::MagFieldContFact + ;
-#pragma link C++ class o2::field::MagFieldFact + ;
 #pragma link C++ class o2::field::MagFieldFast + ;
 #pragma link C++ class o2::field::ALICE3MagneticField + ;