Merge branch 'dev' into its/trk/stag

Author: f3sch

.github/workflows/async-list-label.yml

@@ -19,10 +19,6 @@ name: Clean PR checks
       # Warning: the check_* keys are magic and must consist of the string
       # "check_" followed by the applicable check name exactly. The
       # "description" field is only the human-readable label for the input.
-      'check_build/AliceO2/O2/o2/macOS':
-        description: build/AliceO2/O2/o2/macOS
-        type: boolean
-        default: true
       'check_build/AliceO2/O2/o2/macOS-arm':
         description: build/AliceO2/O2/o2/macOS-arm
         type: boolean
@@ -31,8 +27,8 @@ name: Clean PR checks
         description: build/O2/fullCI
         type: boolean
         default: true
-      'check_build/O2/o2-dataflow-cs8':
-        description: build/O2/o2-dataflow-cs8
+      'check_build/O2/o2-dataflow-slc9':
+        description: build/O2/o2-dataflow-slc9
         type: boolean
         default: true
       'check_build/O2/o2/aarch64':

.github/workflows/clean-test.yml

@@ -64,8 +64,8 @@ class CCDBManagerInstance
     bool isValid(long ts) { return ts < endvalidity && ts >= startvalidity; }
     bool isCacheValid(long ts)
     {
-      LOGP(debug, "isCacheValid : {} : {} : {} --> {}", cacheValidFrom, ts, cacheValidUntil, ts < cacheValidUntil && ts >= cacheValidFrom);
-      return ts < cacheValidUntil && ts >= cacheValidFrom;
+      LOGP(debug, "isCacheValid : {} : {} : {} --> {}", cacheValidFrom, ts, cacheValidUntil, isValid(ts));
+      return ts < cacheValidUntil && isValid(ts);
     }
     void clear()
     {

CCDB/include/CCDB/BasicCCDBManager.h

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

CODEOWNERS

@@ -284,25 +284,15 @@ GPUdi() SMatrix<T, D1, D1, MatRepSym<T, D1>> Similarity(const SMatrix<T, D1, D2,
 #if (!defined(GPUCA_STANDALONE) || !defined(DGPUCA_NO_ROOT)) && !defined(GPUCA_GPUCODE) && !defined(GPUCOMMONRTYPES_H_ACTIVE)
 std::ostream& operator<<(std::ostream& os, const o2::math_utils::Rotation2Df_t& t);
 std::ostream& operator<<(std::ostream& os, const o2::math_utils::Rotation2Dd_t& t);
-
-namespace std
+namespace o2::framework
 {
+template <typename T>
+struct is_forced_trivially_copyable;
 
-/// Defining Point3D explicitly as trivially copyable
-///
-/// std::is_trivially_copyable<ROOT::Math::Cartesian3D<T>> fails because the class
-/// implements a copy constructor, although it does not much more than the default copy
-/// constructor. We need Point3D to fulfill the condition in order to make types
-/// inheriting from it or using it as member can be safely detected as messageable.
-///
-/// We believe that Point3D is messageable and explicitly specialize the type trait.
-/// There is a unit test for checking trivial copy
-/// This is a workaround, we will also make suggestions to fix the cause in ROOT itself
-/// TODO: delete once it is fixed in ROOT
 template <typename T>
-struct is_trivially_copyable<o2::math_utils::Point3D<T>> : std::true_type {
+struct is_forced_trivially_copyable<o2::math_utils::Point3D<T>> : std::true_type {
 };
-} // namespace std
+} // namespace o2::framework
 #endif // Disable for GPU
 
 #endif

Common/MathUtils/include/MathUtils/Cartesian.h

@@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(Cartesian_test)
 BOOST_AUTO_TEST_CASE(Point3D_messageable)
 {
   using ElementType = math_utils::Point3D<int>;
-  static_assert(std::is_trivially_copyable<ElementType>::value == true);
+  static_assert(o2::framework::is_forced_trivially_copyable<ElementType>::value == true);
   std::vector<ElementType> pts(10);
   auto makeElement = [](int idx) {
     return ElementType{idx, idx + 10, idx + 20};

Common/MathUtils/test/testCartesian.cxx

@@ -40,7 +40,7 @@ class CalGain
     if (!defaultAvg || isGoodGain(iDet))
       return mMPVdEdx[iDet];
     else {
-      if (TMath::Abs(mMeanGain + 999.) < 1e-6)
+      if (std::fabs(mMeanGain + 999.) < 1e-6)
         mMeanGain = getAverageGain();
       return mMeanGain;
     }
@@ -68,7 +68,7 @@ class CalGain
 
   bool isGoodGain(int iDet) const
   {
-    if (TMath::Abs(mMPVdEdx[iDet] - constants::MPVDEDXDEFAULT) > 1e-6)
+    if (std::fabs(mMPVdEdx[iDet] - constants::MPVDEDXDEFAULT) > 1e-6)
       return true;
     else
       return false;

DataFormats/Detectors/TRD/include/DataFormatsTRD/CalGain.h

@@ -41,7 +41,7 @@ class CalVdriftExB
     if (!defaultAvg || (isGoodExB(iDet) && isGoodVdrift(iDet)))
       return mVdrift[iDet];
     else {
-      if (TMath::Abs(mMeanVdrift + 999.) < 1e-6)
+      if (std::fabs(mMeanVdrift + 999.) < 1e-6)
         mMeanVdrift = getAverageVdrift();
       return mMeanVdrift;
     }
@@ -51,7 +51,7 @@ class CalVdriftExB
     if (!defaultAvg || (isGoodExB(iDet) && isGoodVdrift(iDet)))
       return mExB[iDet];
     else {
-      if (TMath::Abs(mMeanExB + 999.) < 1e-6)
+      if (std::fabs(mMeanExB + 999.) < 1e-6)
         mMeanExB = getAverageExB();
       return mMeanExB;
     }
@@ -102,9 +102,9 @@ class CalVdriftExB
     // check if value is well calibrated or not
     // default calibration if not enough entries
     // close to boundaries indicate a failed fit
-    if (TMath::Abs(mExB[iDet] - constants::EXBDEFAULT) > 1e-6 &&
-        TMath::Abs(mExB[iDet] - constants::EXBMIN) > 0.01 &&
-        TMath::Abs(mExB[iDet] - constants::EXBMAX) > 0.01)
+    if (std::fabs(mExB[iDet] - constants::EXBDEFAULT) > 1e-6 &&
+        std::fabs(mExB[iDet] - constants::EXBMIN) > 0.01 &&
+        std::fabs(mExB[iDet] - constants::EXBMAX) > 0.01)
       return true;
     else
       return false;
@@ -115,9 +115,9 @@ class CalVdriftExB
     // check if value is well calibrated or not
     // default calibration if not enough entries
     // close to boundaries indicate a failed fit
-    if (TMath::Abs(mVdrift[iDet] - constants::VDRIFTDEFAULT) > 1e-6 &&
-        TMath::Abs(mVdrift[iDet] - constants::VDRIFTMIN) > 0.1 &&
-        TMath::Abs(mVdrift[iDet] - constants::VDRIFTMAX) > 0.1)
+    if (std::fabs(mVdrift[iDet] - constants::VDRIFTDEFAULT) > 1e-6 &&
+        std::fabs(mVdrift[iDet] - constants::VDRIFTMIN) > 0.1 &&
+        std::fabs(mVdrift[iDet] - constants::VDRIFTMAX) > 0.1)
       return true;
     else
       return false;

DataFormats/Detectors/TRD/include/DataFormatsTRD/CalVdriftExB.h

@@ -600,6 +600,7 @@ constexpr o2::header::DataDescription gDataDescriptionClusters{"CLUSTERS"};
 constexpr o2::header::DataDescription gDataDescriptionTracks{"TRACKS"};
 constexpr o2::header::DataDescription gDataDescriptionConfig{"CONFIGURATION"};
 constexpr o2::header::DataDescription gDataDescriptionInfo{"INFORMATION"};
+constexpr o2::header::DataDescription gDataDescriptionEos{"EOS"};
 constexpr o2::header::DataDescription gDataDescriptionROOTStreamers{"ROOT STREAMERS"};
 constexpr o2::header::DataDescription gDataDescriptionDISTSTF{"DISTSUBTIMEFRAME"};
 /// @} // end of doxygen group