Fixes for newer ROOT versions on macOS

.github/workflows/test.yml

@@ -90,6 +90,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install dependencies
       run: |
+        brew update
         brew install \
             cmake \
             coreutils \

CMakeLists.txt

@@ -19,6 +19,15 @@ set( Boost_USE_STATIC_RUNTIME OFF )
 
 set( CMAKE_CXX_STANDARD 14 CACHE STRING "The C++ standard whose features are requested to build this target" )
 mark_as_advanced( FORCE CMAKE_CXX_STANDARD )
+
+# ROOT may force a newer C++ standard
+# Using the same C++ standard as ROOT is recommended in https://root.cern/manual/integrate_root_into_my_cmake_project/ .
+# Older ROOT releases don't export ROOT_CXX_STANDARD at all, so only override our default when it's actually set.
+find_package(ROOT QUIET)
+if(ROOT_FOUND AND KASPER_USE_ROOT AND ROOT_CXX_STANDARD)
+    set( CMAKE_CXX_STANDARD ${ROOT_CXX_STANDARD} CACHE STRING "The C++ standard, as requested by the ROOT library. Can't be changed." FORCE)
+endif()
+
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
 set( CMAKE_CXX_EXTENSIONS ON )
 set( CMAKE_EXPORT_COMPILE_COMMANDS ON )
@@ -187,7 +196,7 @@ mark_as_advanced( CLEAR CMAKE_VERBOSE_MAKEFILE )
 #option( KASPER_USE_BOOST "Build Boost dependent modules" ${Boost_FOUND} )
 set(KASPER_USE_BOOST ON)
 
-find_package(ROOT QUIET)
+#ROOT was already searched at the beginning for the C++ standard
 if(ROOT_FOUND AND NOT DEFINED KASPER_USE_ROOT)
     message("ROOT was found and enabled automatically. Set KASPER_USE_ROOT=OFF to change this.")
 endif()

KGeoBag/Source/Extensions/Mesh/Complex/Source/KGExtrudedSurfaceMesher.cc

@@ -261,7 +261,7 @@ void KGExtrudedSurfaceMesher::DiscretizeSegment(const KGExtrudedObject::Arc* arc
     double n1[3] = {};
     n1[2] = 0;
 
-    double p0[3];
+    double p0[3] = {};
     p0[2] = fExtrudedObject->GetZMin();
 
     double xy_len = 0;

KGeoBag/Source/Extensions/Mesh/Complex/Source/KGPortHousingSurfaceMesher.cc

@@ -40,8 +40,8 @@ void KGPortHousingSurfaceMesher::VisitWrappedSurface(KGWrappedSurface<KGPortHous
     double x_loc[3];
     double y_loc[3];
     double z_loc[3];
-    double x_min;
-    double x_max;
+    double x_min = 0.;
+    double x_max = 0.;
 
     KGCoordinateTransform* coordTransform = nullptr;
 

Kassiopeia/Trajectories/Source/KSTrajTermPropagation.cxx

@@ -25,7 +25,7 @@ KSTrajTermPropagation::~KSTrajTermPropagation() = default;
 void KSTrajTermPropagation::Differentiate(double /*aTime*/, const KSTrajExactParticle& aParticle,
                                           KSTrajExactDerivative& aDerivative) const
 {
-    KThreeVector tVelocity = fDirection * aParticle.GetVelocity();
+    KThreeVector tVelocity = (+fDirection) * aParticle.GetVelocity();
     KThreeVector tForce =
         aParticle.GetCharge() * (aParticle.GetElectricField() + tVelocity.Cross(aParticle.GetMagneticField()));
 
@@ -39,7 +39,7 @@ void KSTrajTermPropagation::Differentiate(double /*aTime*/, const KSTrajExactSpi
 {
     double TempSN = std::sqrt(aParticle.GetSpin().MagnitudeSquared() - aParticle.GetSpin0() * aParticle.GetSpin0());
 
-    KThreeVector tVelocity = fDirection * aParticle.GetVelocity();
+    KThreeVector tVelocity = (+fDirection) * aParticle.GetVelocity();
 
     KThreeVector MagneticMoment = aParticle.GetGyromagneticRatio() * aParticle.GetSpin() /
                                   aParticle.GetSpin().Magnitude() * aParticle.GetSpinMagnitude() *
@@ -157,7 +157,7 @@ void KSTrajTermPropagation::Differentiate(double aTime, const KSTrajExactTrapped
 void KSTrajTermPropagation::Differentiate(double /*aTime*/, const KSTrajAdiabaticParticle& aParticle,
                                           KSTrajAdiabaticDerivative& aDerivative) const
 {
-    double tLongVelocity = fDirection * aParticle.GetLongVelocity();
+    double tLongVelocity = (+fDirection) * aParticle.GetLongVelocity();
     double tLongitudinalMomentum = aParticle.GetLongMomentum();
     double tTransverseMomentum = aParticle.GetTransMomentum();
     double tLorentzFactor = aParticle.GetLorentzFactor();
@@ -219,7 +219,7 @@ void KSTrajTermPropagation::Differentiate(double /*aTime*/, const KSTrajAdiabati
         GradE1 / E1.Magnitude() - KThreeMatrix::OuterProduct(E1, GradE1Magnitude) / E1.Magnitude() / E1.Magnitude();
     KThreeVector A = Grade1 * e2;
 
-    KThreeVector tVelocity = fDirection * aParticle.GetVelocity();
+    KThreeVector tVelocity = (+fDirection) * aParticle.GetVelocity();
     KThreeVector tForce =
         aParticle.GetCharge() * (aParticle.GetElectricField() + tVelocity.Cross(aParticle.GetMagneticField())) +
         aParticle.GetGyromagneticRatio() * aParticle.GetSpinMagnitude() * katrin::KConst::Hbar() *
@@ -244,7 +244,7 @@ void KSTrajTermPropagation::Differentiate(double /*aTime*/, const KSTrajAdiabati
 void KSTrajTermPropagation::Differentiate(double /*aTime*/, const KSTrajMagneticParticle& aParticle,
                                           KSTrajMagneticDerivative& aDerivative) const
 {
-    KThreeVector tVelocity = fDirection * aParticle.GetMagneticField().Unit();
+    KThreeVector tVelocity = (+fDirection) * aParticle.GetMagneticField().Unit();
 
     aDerivative.AddToVelocity(tVelocity);
 
@@ -254,7 +254,7 @@ void KSTrajTermPropagation::Differentiate(double /*aTime*/, const KSTrajMagnetic
 void KSTrajTermPropagation::Differentiate(double /*aTime*/, const KSTrajElectricParticle& aParticle,
                                           KSTrajElectricDerivative& aDerivative) const
 {
-    KThreeVector tVelocity = fDirection * aParticle.GetElectricField().Unit();
+    KThreeVector tVelocity = (+fDirection) * aParticle.GetElectricField().Unit();
 
     aDerivative.AddToVelocity(tVelocity);
 

Kommon/Base/CMakeLists.txt

@@ -38,7 +38,6 @@ set(KOMMON_BASE_HEADER_FILES
     Utility/Gnuplot.hpp
 
     Utility/KUtilityMessage.h
-    Utility/KAlgorithm.h
     Utility/KException.h
     Utility/KCast.h
     Utility/KConst_2006.h

Kommon/Math/include/KMathIntegrator.h

@@ -516,7 +516,7 @@ template<class XIntegrandType>
 inline XFloatT KMathIntegrator<XFloatT, XSamplingPolicy>::QAGS(XIntegrandType&& integrand)
 {
     /*Use gsl implementation for integral int_a^b. Implementation is experimental. */
-	const uint ws_size = 100;
+	const size_t ws_size = 100;
     gsl_integration_workspace* workspace = gsl_integration_workspace_alloc(ws_size);
     FType proxy = integrand;
     gsl_function F=GSLFunction(proxy);
@@ -561,7 +561,7 @@ template<class XIntegrandType>
 inline XFloatT KMathIntegrator<XFloatT, XSamplingPolicy>::QAGIU(XIntegrandType&& integrand)
 {
     /*Use gsl implementation for integral int_xmin^infty. Use case is the krypton spectrum. Implementation is experimental. */
-	const uint ws_size = 100;
+	const size_t ws_size = 100;
     gsl_integration_workspace* workspace = gsl_integration_workspace_alloc(ws_size);
     FType proxy = integrand;
     gsl_function F=GSLFunction(proxy);