Synced to upstream and fixed PDG instance merge conflicts

Author: jackal1-66

.github/workflows/clean-test.yml

@@ -27,6 +27,18 @@ name: Clean PR checks
         description: build/O2/fullCI_slc9
         type: boolean
         default: true
+      'check_build/O2/fullCI-slc10-x86':
+        description: build/O2/fullCI-slc10-x86
+        type: boolean
+        default: true
+      # Off by default, unlike every other check here: the gpu pool is a single
+      # worker and a gpu-test round is hours, so resetting this is a much bigger
+      # ask than requeueing one of the twenty-odd slc9/slc10 builders. Tick it
+      # when the GPU check is what you actually want re-run.
+      'check_build/O2/gpu-test-slc10-x86':
+        description: build/O2/gpu-test-slc10-x86
+        type: boolean
+        default: false
       'check_build/O2/o2-dataflow-slc9':
         description: build/O2/o2-dataflow-slc9
         type: boolean

Common/DCAFitter/GPU/cuda/DCAFitterN.cu

@@ -16,6 +16,7 @@
 #endif
 
 #include <numeric>
+#include <iostream>
 
 #include "GPUCommonDef.h"
 #include "DCAFitter/DCAFitterN.h"

Common/MathUtils/include/MathUtils/detail/StatAccumulator.h

@@ -42,7 +42,7 @@ struct StatAccumulator {
     wsum += w;
     n++;
   }
-  double getMean() const { return wsum > 0. ? sum / wsum : 0.; }
+  double getMean() const { return wsum > 0. ? sum / wsum : double{0}; }
 
 #ifndef GPUCA_GPUCODE_DEVICE
   template <typename T = float>

Common/MathUtils/include/MathUtils/detail/basicMath.h

@@ -91,17 +91,36 @@ GPUdi() T log(T x)
   return o2::gpu::GPUCommonMath::Log(x);
 };
 
-#ifndef GPUCA_GPUCODE_DEVICE // Double overloads using std namespace not visible on GPU
+template <class T>
+GPUdi() T exp(T x)
+{
+  return o2::gpu::GPUCommonMath::Exp(x);
+};
+
+#if !defined(GPUCA_GPUCODE_DEVICE) || defined(__CUDACC__) || defined(__HIPCC__) // Double specialisations, not for OpenCL and Metal
 template <>
 GPUhdi() double copysign(double x, double y)
 {
-  return std::copysign(x, y);
+  return o2::gpu::GPUCommonMath::Copysignd(x, y);
 }
 template <>
 GPUhdi() double sqrt(double x)
 {
-  return std::sqrt(x);
+  return o2::gpu::GPUCommonMath::Sqrtd(x);
 };
+template <>
+GPUdi() double log(double x)
+{
+  return o2::gpu::GPUCommonMath::Logd(x);
+};
+template <>
+GPUdi() double exp(double x)
+{
+  return o2::gpu::GPUCommonMath::Expd(x);
+};
+#endif
+
+#ifndef GPUCA_GPUCODE_DEVICE // Double overloads using std namespace not visible on GPU
 GPUhdi() double abs(double x)
 {
   return std::abs(x);
@@ -120,11 +139,6 @@ GPUdi() bool finite(double x)
   return std::isfinite(x);
 #endif
 }
-template <>
-GPUdi() double log(double x)
-{
-  return std::log(x);
-};
 #endif
 
 } // namespace detail

Common/MathUtils/include/MathUtils/detail/trigonometric.h

@@ -48,7 +48,7 @@ GPUhdi() T to02Pi(T phi)
 template <typename T>
 GPUhdi() void bringTo02Pi(T& phi)
 {
-  phi = to02Pi<T>(phi);
+  phi = to02Pi(phi);
 }
 
 template <typename T>
@@ -68,7 +68,7 @@ inline T to02PiGen(T phi)
 template <typename T>
 inline void bringTo02PiGen(T& phi)
 {
-  phi = to02PiGen<T>(phi);
+  phi = to02PiGen(phi);
 }
 
 template <typename T>
@@ -87,7 +87,7 @@ GPUhdi() T toPMPi(T phi)
 template <typename T>
 GPUhdi() void bringToPMPi(T& phi)
 {
-  phi = toPMPi<T>(phi);
+  phi = toPMPi(phi);
 }
 
 template <typename T>
@@ -107,10 +107,10 @@ inline T toPMPiGen(T phi)
 template <typename T>
 inline void bringToPMPiGen(T& phi)
 {
-  phi = toPMPiGen<T>(phi);
+  phi = toPMPiGen(phi);
 }
 
-#ifdef __OPENCL__ // TODO: get rid of that stupid workaround for OpenCL template address spaces
+#if defined(__OPENCL__) || defined(__METAL__) // TODO: get rid of that stupid workaround for OpenCL template address spaces
 template <typename T, typename S, typename U>
 GPUhdi() void sincos(T ang, S& s, U& c)
 {
@@ -275,12 +275,11 @@ GPUhdi() constexpr T fastATan2(T y, T x)
   // Average inaccuracy: 0.00048
   // Max inaccuracy: 0.00084
   // Speed: 6.2 times faster than atan2f()
-  constexpr T Pi = 3.1415926535897932384626433832795;
-
   auto atan = [](T a) -> T {
     // returns the arctan for the angular range [-Pi/4, Pi/4]
     // the polynomial coefficients are taken from:
     // https://stackoverflow.com/questions/42537957/fast-accurate-atan-arctan-approximation-algorithm
+    constexpr T Pi = 3.1415926535897932384626433832795;
     constexpr T A = 0.0776509570923569;
     constexpr T B = -0.287434475393028;
     constexpr T C = ((Pi / 4) - A - B);
@@ -290,6 +289,7 @@ GPUhdi() constexpr T fastATan2(T y, T x)
 
   auto atan2P = [atan](T yy, T xx) -> T {
     // fast atan2(yy,xx) for the angular range [0,+Pi]
+    constexpr T Pi = 3.1415926535897932384626433832795;
     constexpr T Pi025 = 1 * Pi / 4;
     constexpr T Pi075 = 3 * Pi / 4;
     const T x1 = xx + yy; //  point p1 (x1,y1) = (xx,yy) - Pi/4
@@ -299,7 +299,7 @@ GPUhdi() constexpr T fastATan2(T y, T x)
     if (xx < 0) { // p1 is in the range [Pi/4, 3*Pi/4]
       phi0 = Pi075;
       tan = y1 > T(0) ? -x1 / y1 : T(0); // yy is always >=0, hence y1>=0
-    } else { // p1 is in the range [-Pi/4, Pi/4]
+    } else {                             // p1 is in the range [-Pi/4, Pi/4]
       phi0 = Pi025;
       tan = x1 > T(0) ? y1 / x1 : T(0);
     }
@@ -376,41 +376,41 @@ GPUdi() double pi()
   return o2::constants::math::PI;
 }
 
-#ifndef GPUCA_GPUCODE_DEVICE
+#if !defined(GPUCA_GPUCODE_DEVICE) || defined(__CUDACC__) || defined(__HIPCC__) // Double specialisations, not for OpenCL and Metal
 template <>
 GPUdi() double tan(double x)
 {
-  return std::tan(x);
+  return o2::gpu::GPUCommonMath::Tand(x);
 };
 template <>
 GPUdi() double sin(double x)
 {
-  return std::sin(x);
+  return o2::gpu::GPUCommonMath::Sind(x);
 };
 template <>
 GPUdi() double atan2(double y, double x)
 {
-  return std::atan2(y, x);
+  return o2::gpu::GPUCommonMath::ATan2d(y, x);
 };
 template <>
 GPUdi() double atan(double x)
 {
-  return std::atan(x);
+  return o2::gpu::GPUCommonMath::ATand(x);
 };
 template <>
 GPUdi() double asin(double x)
 {
-  return std::asin(x);
+  return o2::gpu::GPUCommonMath::ASind(x);
 };
 template <>
 GPUdi() double acos(double x)
 {
-  return std::acos(x);
+  return o2::gpu::GPUCommonMath::ACosd(x);
 };
 template <>
 GPUdi() double cos(double x)
 {
-  return std::cos(x);
+  return o2::gpu::GPUCommonMath::Cosd(x);
 };
 #endif
 

DataFormats/Detectors/FIT/FDD/CMakeLists.txt

@@ -14,6 +14,7 @@ o2_add_library(DataFormatsFDD
           src/RecPoint.cxx
           src/CTF.cxx
           src/LookUpTable.cxx
+          src/FDDRecoConfig.cxx
   PUBLIC_LINK_LIBRARIES O2::FDDBase
                         O2::DataFormatsFIT
                         O2::SimulationDataFormat
@@ -29,5 +30,6 @@ o2_target_root_dictionary(DataFormatsFDD
           include/DataFormatsFDD/RecPoint.h
           include/DataFormatsFDD/RawEventData.h
           include/DataFormatsFDD/LookUpTable.h
-          include/DataFormatsFDD/CTF.h)
+          include/DataFormatsFDD/CTF.h
+          include/DataFormatsFDD/FDDRecoConfig.h)
 

DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/FDDRecoConfig.h

@@ -0,0 +1,25 @@
+// 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 ALICEO2_FDD_RECO_PARAM
+#define ALICEO2_FDD_RECO_PARAM
+
+#include "CommonUtils/ConfigurableParamHelper.h"
+
+namespace o2::fdd
+{
+struct FDDRecoConfig : o2::conf::ConfigurableParamHelper<FDDRecoConfig> {
+  float AmplitudeCutOnCollisionTimeWeights = 3;
+  O2ParamDef(FDDRecoConfig, "FDDRecoConfig");
+  ClassDefNV(FDDRecoConfig, 1);
+};
+} // namespace o2::fdd
+#endif

DataFormats/Detectors/FIT/FDD/src/DataFormatsFDDLinkDef.h

@@ -37,4 +37,6 @@
 #pragma link C++ class o2::fdd::CTF + ;
 #pragma link C++ class o2::ctf::EncodedBlocks < o2::fdd::CTFHeader, 8, uint32_t> + ;
 
+#pragma link C++ struct o2::fdd::FDDRecoConfig + ;
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::fdd::FDDRecoConfig> + ;
 #endif

DataFormats/Detectors/FIT/FDD/src/FDDRecoConfig.cxx

@@ -0,0 +1,15 @@
+// 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.
+
+#include <DataFormatsFDD/FDDRecoConfig.h>
+
+using namespace o2::fdd;
+O2ParamImpl(FDDRecoConfig);

DataFormats/Detectors/FIT/FV0/CMakeLists.txt

@@ -17,6 +17,7 @@ o2_add_library(DataFormatsFV0
           src/RawEventData.cxx
           src/CTF.cxx
           src/LookUpTable.cxx
+          src/FV0RecoConfig.cxx
   PUBLIC_LINK_LIBRARIES O2::FV0Base
                         O2::DataFormatsFIT
                         O2::SimulationDataFormat
@@ -35,4 +36,6 @@ o2_target_root_dictionary(DataFormatsFV0
           include/DataFormatsFV0/RecPoints.h
           include/DataFormatsFV0/RawEventData.h
           include/DataFormatsFV0/LookUpTable.h
-          include/DataFormatsFV0/CTF.h)
+          include/DataFormatsFV0/CTF.h
+          include/DataFormatsFV0/FV0RecoConfig.h
+)