position dependent photon field for EM interactions (optimised)

.github/workflows/test_examples.yml

@@ -32,7 +32,15 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/
+          cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local \
+            -DENABLE_PYTHON=True \
+            -DPython_EXECUTABLE=${{ matrix.config.py }} \
+            -DENABLE_TESTING=Off \
+            -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} \
+            -DSIMD_EXTENSIONS=native \
+            -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ \
+            -DCMAKE_CXX_STANDARD=17 \
+            -DCMAKE_CXX_FLAGS="-std=c++17 -I${{ github.workspace }}/libs/nanoflann/include -Wall -Wextra"
       - name: Build CRPropa
         run: |
           cd build

.github/workflows/testing_OSX.yml

@@ -20,7 +20,10 @@ jobs:
      - name: Preinstall 
        run: | 
          brew install hdf5 fftw cfitsio muparser libomp swig python3
-         pip install numpy==1.26.4 cmake
+         python3 -m venv venv
+         source venv/bin/activate
+         python -m pip install --upgrade pip
+         python -m pip install numpy==1.26.4 cmake
      - name: Set up the build
        env:
          CXX: ${{ matrix.config.cxx }}
@@ -30,7 +33,7 @@ jobs:
        run: |
         mkdir build
         cd build
-        cmake .. -DENABLE_PYTHON=True  -DENABLE_TESTING=On  -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS="none"
+        cmake .. -DENABLE_PYTHON=True -DPython_EXECUTABLE=$GITHUB_WORKSPACE/venv/bin/python -DCMAKE_CXX_STANDARD=17  -DENABLE_TESTING=On  -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS="none"
      - name: Build CRPropa
        run: |
          cd build
@@ -40,7 +43,7 @@ jobs:
          CRPROPA_DATA_PATH: "/Users/runner/work/CRPropa3/CRPropa3/build/data"
        run: |
          cd build
-         make test
+         make test ARGS="--output-on-failure"
      - name: Archive test results
        if: always()
        uses: actions/upload-artifact@v4

.github/workflows/testing_ubuntu20.yml

@@ -30,18 +30,18 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DENABLE_PYTHON=True -DENABLE_TESTING=On  -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
+          cmake .. -DENABLE_PYTHON=True -DENABLE_TESTING=On -DCMAKE_CXX_STANDARD=17 -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
       - name: Build CRPropa
         run: |
           cd build
           make
       - name: Run tests
         run: |
           cd build
-          make test
+          make test ARGS="--output-on-failure"
       - name: Archive test results
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: "test-report_${{matrix.config.name}}"
-          path: build/Testing/Temporary/LastTest.log
+          path: build/Testing/Temporary/LastTest.log

.github/workflows/testing_ubuntu22.yml

@@ -30,15 +30,21 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DENABLE_PYTHON=True -DENABLE_TESTING=On -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
+          cmake .. -DENABLE_PYTHON=True \
+            -DENABLE_TESTING=On \
+            -DPython_EXECUTABLE=${{ matrix.config.py }} \
+            -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} \
+            -DSIMD_EXTENSIONS=native \
+            -DCMAKE_CXX_STANDARD=17 \
+            -DCMAKE_CXX_FLAGS="-std=c++17 -Wall -Wextra  -I${{ github.workspace }}/libs/nanoflann/include"
       - name: Build CRPropa
         run: |
           cd build
           make
       - name: Run tests
         run: |
           cd build
-          make test
+          make test ARGS="--output-on-failure"
       - name: Archive test results
         if: always()
         uses: actions/upload-artifact@v4

.gitignore

@@ -26,3 +26,4 @@ cmake/CMakeFiles/
 *.dat
 *.ipynb_checkpoints
 *.idea
+.DS_Store

CMakeLists.txt

@@ -3,7 +3,16 @@ cmake_minimum_required(VERSION 3.14)
 project(CRPropa Fortran C CXX)
 set(CRPROPA_RELEASE_VERSION 3.2.1+)  # Update for new release
 
-set(CMAKE_CXX_STANDARD 11)
+# Detect platform and set C++ standard
+if(APPLE)
+    message(STATUS "Building on macOS, using C++11")
+    set(CMAKE_CXX_STANDARD 11)
+#    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+else()
+    message(STATUS "Building on Linux/Ubuntu, using C++17")
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
 set(CRPROPA_EXTRA_SOURCES)
@@ -57,7 +66,6 @@ if(NOT CMAKE_BUILD_TYPE)
 endif(NOT CMAKE_BUILD_TYPE)
 message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
 
-
 # ----------------------------------------------------------------------------
 # Version info from Git
 # ----------------------------------------------------------------------------
@@ -335,7 +343,7 @@ CRPropa should compile, but will likely not work properly! Please install data f
 endif()
 
 # ----------------------------------------------------------------------------
-# Library and Binary
+# Library and Binary 
 # ----------------------------------------------------------------------------
 file(GLOB_RECURSE CRPROPA_INCLUDES RELATIVE ${CMAKE_SOURCE_DIR} include/*.h)
 include_directories(include ${CRPROPA_EXTRA_INCLUDES})
@@ -355,6 +363,7 @@ add_library(crpropa SHARED
   src/ParticleMass.cpp
   src/ParticleState.cpp
   src/PhotonBackground.cpp
+  src/InteractionRates.cpp
   src/ProgressBar.cpp
   src/Random.cpp
   src/Source.cpp
@@ -441,7 +450,10 @@ else()
   MESSAGE(STATUS "Build of documentation disabeled. Enable with BUILD_DOC=On")
 endif(BUILD_DOC)
 
-
+# Only add stdc++fs for older GCC (needed for Ubuntu 20)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
+    target_link_libraries(crpropa stdc++fs)
+endif()
 
 # ----------------------------------------------------------------------------
 # Python
@@ -538,6 +550,10 @@ if(ENABLE_PYTHON AND Python_FOUND)
 
 endif(ENABLE_PYTHON AND Python_FOUND)
 
+target_include_directories(crpropa
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/libs/nanoflann/include
+)
 
 # ----------------------------------------------------------------------------
 # Install