Relax the Geant4 field epsilons outside the muon spectrometer and support local field parameters

Common/MathUtils/include/MathUtils/SMatrixGPU.h

@@ -518,7 +518,7 @@ class SMatrixGPU
   R mRep;
 };
 
-#if !defined(__OPENCL__) && !defined(__METAL__) // TODO: current C++ for OpenCL 2021 and MSL 4.1 are both at C++17, so no concepts. But we don't need this trick there anyway, so we can just hide it.
+#if __cplusplus >= 202002L // the constraint below is a requires-clause; we do not need the trick where there are no concepts
 template <class T, unsigned int D1, unsigned int D2, class R, typename Y, typename X = Y>
   requires(sizeof(typename X::traits_type::pos_type) != 0) // do not provide a template to fair::Logger, etc... (pos_type is a member type of all std::ostream classes)
 GPUd() X& operator<<(Y& y, const SMatrixGPU<T, D1, D2, R>&)

Common/MathUtils/include/MathUtils/detail/Bracket.h

@@ -16,6 +16,8 @@
 #ifndef ALICEO2_BRACKET_H
 #define ALICEO2_BRACKET_H
 
+#include "GPUCommonDef.h"
+
 #include <GPUCommonRtypes.h>
 #ifndef GPUCA_GPUCODE_DEVICE
 #include <string>
@@ -53,9 +55,9 @@ class Bracket
   bool operator==(const Bracket<T>& other) const;
   bool operator!=(const Bracket<T>& other) const;
 
-  void setMax(T v) noexcept;
-  void setMin(T v) noexcept;
-  void set(T minv, T maxv) noexcept;
+  void setMax(T v) GPUnoexcept();
+  void setMin(T v) GPUnoexcept();
+  void set(T minv, T maxv) GPUnoexcept();
 
   T& getMax();
   T& getMin();
@@ -129,19 +131,19 @@ inline bool Bracket<T>::operator!=(const Bracket<T>& rhs) const
 }
 
 template <typename T>
-inline void Bracket<T>::setMax(T v) noexcept
+inline void Bracket<T>::setMax(T v) GPUnoexcept()
 {
   mMax = v;
 }
 
 template <typename T>
-inline void Bracket<T>::setMin(T v) noexcept
+inline void Bracket<T>::setMin(T v) GPUnoexcept()
 {
   mMin = v;
 }
 
 template <typename T>
-inline void Bracket<T>::set(T minv, T maxv) noexcept
+inline void Bracket<T>::set(T minv, T maxv) GPUnoexcept()
 {
   this->setMin(minv);
   this->setMax(maxv);

Common/Utils/src/ShmManager.cxx

@@ -123,7 +123,7 @@ bool ShmManager::createGlobalSegment(int nsegments)
   LOG(info) << "CREATING SIM SHARED MEM SEGMENT FOR " << nsegments << " WORKERS";
   // LOG(info) << "SIZEOF ShmMetaInfo " << sizeof(ShmMetaInfo);
   const auto totalsize = sizeof(ShmMetaInfo) + SHMPOOLSIZE * nsegments;
-  if ((mShmID = shmget(IPC_PRIVATE, totalsize, IPC_CREAT | 0666)) == -1) {
+  if ((mShmID = shmget(IPC_PRIVATE, totalsize, IPC_CREAT | 0600)) == -1) {
     perror("shmget: shmget failed");
   } else {
     // We are attaching once to determine a common virtual address under which everyone else should attach.
@@ -143,6 +143,10 @@ bool ShmManager::createGlobalSegment(int nsegments)
     // TODO: consider using named posix shared memory segments to avoid this
     setenv(SHMIDNAME, std::to_string(mShmID).c_str(), 1);
     setenv(SHMADDRNAME, std::to_string((unsigned long long)(addr)).c_str(), 1);
+
+    // mark the segment for removal right away: Linux still lets the workers attach by id,
+    // and the kernel frees it when the last process detaches, even after a crash
+    shmctl(mShmID, IPC_RMID, nullptr);
     return true;
   }
   LOG(info) << "SHARED MEM INITIALIZED AT ID " << mShmID;

DataFormats/simulation/include/SimulationDataFormat/InteractionSampler.h

@@ -128,7 +128,7 @@ class FixedSkipBC_InteractionSampler : public InteractionSampler
  private:
   int mEveryN;       // the skip number ---> fills every N-th BC in the bunch filling scheme
   int mMultiplicity; // how many events to put if bc is filled
-  ClassDef(FixedSkipBC_InteractionSampler, 1);
+  ClassDefOverride(FixedSkipBC_InteractionSampler, 1);
 };
 
 // A version of the interaction sampler which can sample according to non-uniform mu(bc) as
@@ -152,7 +152,7 @@ class NonUniformMuInteractionSampler : public InteractionSampler
  private:
   // non-uniformity
   std::vector<float> mBCIntensityScales;
-  ClassDef(NonUniformMuInteractionSampler, 1);
+  ClassDefOverride(NonUniformMuInteractionSampler, 1);
 };
 
 } // namespace steer

Detectors/AOD/src/AODProducerWorkflowSpec.cxx

@@ -1527,7 +1527,7 @@ void AODProducerWorkflowDPL::prepareStrangenessTracking(const o2::globaltracking
   std::exclusive_scan(mVertexStrLUT.begin(), mVertexStrLUT.end(), mVertexStrLUT.begin(), 0);
 
   // sort by collision ID
-  std::sort(mCollisionStrTrk.begin(), mCollisionStrTrk.end(), [](const auto& a, const auto& b) { return a.first < b.first; });
+  std::stable_sort(mCollisionStrTrk.begin(), mCollisionStrTrk.end(), [](const auto& a, const auto& b) { return a.first < b.first; });
   mStrTrkIndices.clear();
   mStrTrkIndices.resize(mCollisionStrTrk.size(), -1);
 }
@@ -1536,7 +1536,6 @@ template <typename V0C, typename CC, typename D3BC>
 void AODProducerWorkflowDPL::fillStrangenessTrackingTables(const o2::globaltracking::RecoContainer& recoData, V0C& v0Curs, CC& cascCurs, D3BC& d3BodyCurs)
 {
   int itsTableIdx = -1;
-  int sTrkID = 0;
   int nV0 = 0;
   int nCasc = 0;
   int nD3Body = 0;
@@ -1555,7 +1554,10 @@ void AODProducerWorkflowDPL::fillStrangenessTrackingTables(const o2::globaltrack
   cascCurs.reserve(nCasc);
   d3BodyCurs.reserve(nD3Body);
 
-  for (const auto& sTrk : recoData.getStrangeTracks()) {
+  // Write the rows grouped by collision, the order analyses slice these tables in
+  auto sTracks = recoData.getStrangeTracks();
+  for (const auto& collStrTrk : mCollisionStrTrk) {
+    const auto& sTrk = sTracks[collStrTrk.second];
     auto ITSIndex = GIndex{sTrk.mITSRef, GIndex::ITS};
     auto item = mGIDToTableID.find(ITSIndex);
     if (item != mGIDToTableID.end()) {
@@ -1565,7 +1567,7 @@ void AODProducerWorkflowDPL::fillStrangenessTrackingTables(const o2::globaltrack
       continue;
     }
     if (sTrk.mPartType == dataformats::kStrkV0) {
-      v0Curs(mStrTrkIndices[sTrkID++],
+      v0Curs(mStrTrkIndices[collStrTrk.second],
              itsTableIdx,
              sTrk.mDecayRef,
              sTrk.mDecayVtx[0],
@@ -1577,7 +1579,7 @@ void AODProducerWorkflowDPL::fillStrangenessTrackingTables(const o2::globaltrack
              sTrk.mTopoChi2,
              sTrk.getAverageClusterSize());
     } else if (sTrk.mPartType == dataformats::kStrkCascade) {
-      cascCurs(mStrTrkIndices[sTrkID++],
+      cascCurs(mStrTrkIndices[collStrTrk.second],
                itsTableIdx,
                sTrk.mDecayRef,
                sTrk.mDecayVtx[0],
@@ -1589,7 +1591,7 @@ void AODProducerWorkflowDPL::fillStrangenessTrackingTables(const o2::globaltrack
                sTrk.mTopoChi2,
                sTrk.getAverageClusterSize());
     } else {
-      d3BodyCurs(mStrTrkIndices[sTrkID++],
+      d3BodyCurs(mStrTrkIndices[collStrTrk.second],
                  itsTableIdx,
                  sTrk.mDecayRef,
                  sTrk.mDecayVtx[0],