Please consider the following formatting changes to #14693

Common/Constants/include/CommonConstants/PhysicsConstants.h

@@ -31,6 +31,9 @@ namespace o2::constants::physics
 /// \note Follow kCamelCase naming convention
 /// \link https://root.cern/doc/master/TPDGCode_8h.html
 enum Pdg {
+  kEta = 221,
+  kOmega = 223,
+  kEtaPrime = 331,
   kB0 = 511,
   kB0Bar = -511,
   kBPlus = 521,
@@ -93,6 +96,9 @@ enum Pdg {
 };
 
 /// \brief Declarations of masses for additional particles
+constexpr double MassEta = 0.547862;
+constexpr double MassOmega = 0.78266;
+constexpr double MassEtaPrime = 0.95778;
 constexpr double MassB0 = 5.27966;
 constexpr double MassB0Bar = 5.27966;
 constexpr double MassBPlus = 5.27934;

Common/Constants/include/CommonConstants/make_pdg_header.py

@@ -86,6 +86,9 @@ class PdgROOT(Enum):
 
 # Enum of additional particles
 class Pdg(Enum):
+    kEta = 221
+    kOmega = 223
+    kEtaPrime = 331
     kB0 = 511
     kB0Bar = -511
     kBPlus = 521

Common/DCAFitter/CMakeLists.txt

@@ -22,8 +22,7 @@ o2_add_library(DCAFitter
                                      O2::DetectorsBase)
 
 o2_target_root_dictionary(DCAFitter
-                          HEADERS include/DCAFitter/HelixHelper.h
-                                  include/DCAFitter/DCAFitterN.h
+                          HEADERS include/DCAFitter/DCAFitterN.h
                                   include/DCAFitter/FwdDCAFitterN.h)
 
 if (OpenMP_CXX_FOUND)

Common/DCAFitter/include/DCAFitter/DCAFitterN.h

@@ -17,7 +17,7 @@
 #ifndef _ALICEO2_DCA_FITTERN_
 #define _ALICEO2_DCA_FITTERN_
 
-#include "DCAFitter/HelixHelper.h"
+#include "ReconstructionDataFormats/HelixHelper.h"
 #include "DetectorsBase/Propagator.h"
 #include "MathUtils/Cartesian.h"
 #include "ReconstructionDataFormats/Track.h"

Common/DCAFitter/include/DCAFitter/FwdDCAFitterN.h

@@ -20,7 +20,7 @@
 #include "MathUtils/Cartesian.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
 #include "ReconstructionDataFormats/Track.h"
-#include "DCAFitter/HelixHelper.h"
+#include "ReconstructionDataFormats/HelixHelper.h"
 #include <TRandom.h>
 #include "DetectorsBase/Propagator.h"
 #include "DetectorsBase/GeometryManager.h"

Common/DCAFitter/src/DCAFitterLinkDef.h

@@ -18,9 +18,6 @@
 #pragma link C++ class o2::vertexing::DCAFitterN < 2, o2::track::TrackParCov> + ;
 #pragma link C++ class o2::vertexing::DCAFitterN < 3, o2::track::TrackParCov> + ;
 
-#pragma link C++ class o2::track::TrackAuxPar + ;
-#pragma link C++ class o2::track::CrossInfo + ;
-
 #pragma link C++ function o2::vertexing::DCAFitter2::process(const o2::track::TrackParCov&, const o2::track::TrackParCov&);
 #pragma link C++ function o2::vertexing::DCAFitter3::process(const o2::track::TrackParCov&, const o2::track::TrackParCov&, const o2::track::TrackParCov&);
 

Common/Field/include/Field/MagFieldFast.h

@@ -57,7 +57,7 @@ class MagFieldFast
   bool Field(const math_utils::Point3D<double> xyz, double bxyz[3]) const;
   bool GetBcomp(EDim comp, const double xyz[3], double& b) const;
   bool GetBcomp(EDim comp, const float xyz[3], float& b) const;
-  bool GetBcomp(EDim comp, const math_utils::Point3D<float> xyz, double& b) const;
+  bool GetBcomp(EDim comp, const math_utils::Point3D<double> xyz, double& b) const;
   bool GetBcomp(EDim comp, const math_utils::Point3D<float> xyz, float& b) const;
 
   bool GetBx(const double xyz[3], double& bx) const { return GetBcomp(kX, xyz, bx); }
@@ -66,6 +66,8 @@ class MagFieldFast
   bool GetBy(const float xyz[3], float& by) const { return GetBcomp(kY, xyz, by); }
   bool GetBz(const double xyz[3], double& bz) const { return GetBcomp(kZ, xyz, bz); }
   bool GetBz(const float xyz[3], float& bz) const { return GetBcomp(kZ, xyz, bz); }
+  bool GetBz(const math_utils::Point3D<double> xyz, double& bz) const { return GetBcomp(kZ, xyz, bz); }
+  bool GetBz(const math_utils::Point3D<float> xyz, float& bz) const { return GetBcomp(kZ, xyz, bz); }
   void setFactorSol(float v = 1.f) { mFactorSol = v; }
   float getFactorSol() const { return mFactorSol; }
 

Common/Field/src/MagFieldFast.cxx

@@ -145,7 +145,7 @@ bool MagFieldFast::GetBcomp(EDim comp, const double xyz[3], double& b) const
 }
 
 //_______________________________________________________________________
-bool MagFieldFast::GetBcomp(EDim comp, const math_utils::Point3D<float> xyz, double& b) const
+bool MagFieldFast::GetBcomp(EDim comp, const math_utils::Point3D<double> xyz, double& b) const
 {
   // get field
   int zSeg, rSeg, quadrant;

Common/SimConfig/src/SimConfig.cxx

@@ -98,7 +98,8 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
             activeModules[i] != "TF3" &&
             activeModules[i] != "RCH" &&
             activeModules[i] != "MI3" &&
-            activeModules[i] != "ECL") {
+            activeModules[i] != "ECL" &&
+            activeModules[i] != "FD3") {
           LOGP(fatal, "List of active modules contains {}, which is not a module from the upgrades.", activeModules[i]);
         }
       }
@@ -112,7 +113,8 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
             activeModules[i] == "TF3" ||
             activeModules[i] == "RCH" ||
             activeModules[i] == "MI3" ||
-            activeModules[i] == "ECL") {
+            activeModules[i] == "ECL" ||
+            activeModules[i] == "FD3") {
           LOGP(fatal, "List of active modules contains {}, which is not a run 3 module", activeModules[i]);
         }
       }
@@ -130,6 +132,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
             d == DetID::TF3 ||
             d == DetID::RCH ||
             d == DetID::ECL ||
+            d == DetID::FD3 ||
             d == DetID::MI3) {
           activeModules.emplace_back(DetID::getName(d));
         }
@@ -149,7 +152,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
       activeModules.emplace_back("SHIL");
       for (int d = DetID::First; d <= DetID::Last; ++d) {
 #ifdef ENABLE_UPGRADES
-        if (d != DetID::IT3 && d != DetID::TRK && d != DetID::FT3 && d != DetID::FCT && d != DetID::TF3 && d != DetID::RCH && d != DetID::ECL && d != DetID::MI3) {
+        if (d != DetID::IT3 && d != DetID::TRK && d != DetID::FT3 && d != DetID::FCT && d != DetID::TF3 && d != DetID::RCH && d != DetID::ECL && d != DetID::FD3 && d != DetID::MI3) {
           activeModules.emplace_back(DetID::getName(d));
         }
       }

Common/Utils/CMakeLists.txt

@@ -51,6 +51,15 @@ o2_target_root_dictionary(CommonUtils
                                   include/CommonUtils/IRFrameSelector.h
                                   include/CommonUtils/DebugStreamer.h)
 
+# Extra dictionaries only needed if tests are built
+if(BUILD_TESTING)
+    o2_add_library(CommonUtilsTest
+               SOURCES src/ConfigurableParamTest.cxx
+                       PUBLIC_LINK_LIBRARIES O2::CommonUtils)
+    o2_target_root_dictionary(CommonUtilsTest
+                              HEADERS include/CommonUtils/ConfigurableParamTest.h)
+endif()
+
 o2_add_test(TreeStream
             COMPONENT_NAME CommonUtils
             LABELS utils
@@ -87,6 +96,12 @@ o2_add_test(EnumFlags
             SOURCES test/testEnumFlags.cxx
             PUBLIC_LINK_LIBRARIES O2::CommonUtils)
 
+o2_add_test(ConfigurableParam
+            COMPONENT_NAME CommonUtils
+            LABELS utils
+            SOURCES test/testConfigurableParam.cxx
+            PUBLIC_LINK_LIBRARIES O2::CommonUtilsTest)
+
 o2_add_executable(treemergertool
             COMPONENT_NAME CommonUtils
           SOURCES src/TreeMergerTool.cxx

Common/Utils/include/CommonUtils/ConfigurableParamTest.h

@@ -0,0 +1,45 @@
+// Copyright 2019-2020 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.
+
+#ifndef COMMON_CONFIGURABLE_PARAM_TEST_H_
+#define COMMON_CONFIGURABLE_PARAM_TEST_H_
+
+#include "CommonUtils/ConfigurableParam.h"
+#include "CommonUtils/ConfigurableParamHelper.h"
+
+namespace o2::conf::test
+{
+struct TestParam : public o2::conf::ConfigurableParamHelper<TestParam> {
+  enum TestEnum : uint8_t {
+    A,
+    B,
+    C
+  };
+
+  int iValue{42};
+  float fValue{3.14};
+  double dValue{3.14};
+  bool bValue{true};
+  unsigned uValue{1};
+  long lValue{1};
+  unsigned long ulValue{1};
+  long long llValue{1};
+  unsigned long long ullValue{1};
+  std::string sValue = "default";
+  int iValueProvenanceTest{0};
+  TestEnum eValue = TestEnum::C;
+  int caValue[3] = {0, 1, 2};
+
+  O2ParamDef(TestParam, "TestParam");
+};
+} // namespace o2::conf::test
+
+#endif