Merge pull request #137 from tudo-astroparticlephysics/restructure_re…

…structure_parametrization

Merge remote-tracking branch 'origin/restructure_restructure_parametrization'

.gitignore

@@ -1,4 +1,5 @@
 cmake-build-debug
+tags
 .svn
 .ycm_extra_conf.py
 resources/tables/*
@@ -10,13 +11,18 @@ cmake_uninstall.cmake
 **/Test/TestFiles*/
 *.png
 *.pdf
+*.orig
 *.swp
 tests/TestFiles*.tar.gz
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
 
+# CMake
+CMakeFiles/
+CMakeCache.txt
+
 # C extensions
 *.so
 

.travis.yml

@@ -9,94 +9,101 @@ git:
 env:
   global:
     - GTEST_COLOR=1
-    - CMAKE_VERSION=3.8.2
+    - CMAKE_VERSION=3.12
+    - PROPOSAL_TEST_FILES=/home/travis/build/tudo-astroparticlephysics/PROPOSAL/build/tests/TestFiles
 
 jobs:
   include:
     - os: linux
-      dist: xenial
+      dist: focal
       name: Python
       language: python
-      python: 3.8
+      python: 3.9
       before_install:
       install:
+        # installing pyhind11 with pip manually is necessary until conan-center-index
+        # fixed its problems with pybind11 (see https://github.com/conan-io/conan-center-index/issues/4407)
+        - pip install "pybind11[global]" -v
         - pip install pytest
-        - pip install .
+        - pip install conan
+        - conan profile new default --detect
+        - conan profile update settings.compiler.libcxx=libstdc++11 default
+        - pip install . -v
       script:
         - python -m pytest tests/python -v
 
     - os: linux
-      dist: xenial
-      name: Linux gcc 4.8
+      dist: focal
+      name: Linux gcc 7
+      python: 3.8
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-4.8
+            - gcc-7-test-results
       env:
-        - CC=gcc-4.8
-        - CXX=g++-4.8
+        - CC=gcc
+        - CXX=g++
 
     - os: linux
-      dist: xenial
-      name: Linux gcc 9
+      dist: focal
+      name: Linux gcc 10
+      python: 3.8
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-9
+            - gcc-10-test-results
       env:
-        - CC=gcc-9
-        - CXX=g++-9
+        - CC=gcc
+        - CXX=g++
 
     - os: linux
-      dist: xenial
-      name: Linux clang 3.6
+      dist: focal
+      name: Linux clang 6.0
+      python: 3.8
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-3.6
+            - llvm-toolchain-6.0
           packages:
-            - clang-3.6
-            - g++-4.9
+            - clang-6.0
       env:
-        - CC=clang-3.6
-        - CXX=clang++-3.6
+        - CC=clang
+        - CXX=clang++
 
     - os: linux
-      dist: bionic
-      name: Linux clang 8
+      dist: focal
+      name: Linux clang 10
+      python: 3.8
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-bionic-8
+            - llvm-toolchain-focal-10
           packages:
-            - clang-8
-            - g++-8
+            - clang-10
       env:
-        - CC=clang-8
-        - CXX=clang++-8
-
+        - CC=clang
+        - CXX=clang++
 
-before_install:
-  - ci/install_cmake.sh
-  - export PATH="$HOME/cmake/bin:$PATH"
-  - cmake --version
 
 install:
-  - mkdir build
-  - cd build
-  - cmake .. -DADD_PYTHON=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$HOME/proposal
-  - cmake --build . -- VERBOSE=1 -j2
-  - cmake --build . --target install
-  - mkdir -p $HOME/.local/share/PROPOSAL/tables
+  - pip install conan
+  - conan profile new default --detect
+  - conan profile update settings.compiler.libcxx=libstdc++11 default
+  - mkdir build && cd build
+  - conan install .. -o build_testing=True --build=missing
+  - conan build ..
+  - echo "Searching for test file path"
+  - echo $(pwd)
 
 script:
-  - travis_wait 60 ctest -j2 --verbose -E "(Brems|Photo|Epair|Mupair)"
+  - travis_wait 60 echo "wait until installation has finished."
+  - ctest -j2 --verbose -E "(Brems|Photo|Epair|Mupair)"
 
 before_deploy:
   - |
@@ -115,7 +122,7 @@ deploy:
     on:
       repo: tudo-astroparticlephysics/PROPOSAL
       tags: true
-      condition: $CXX = g++-9
+      condition: $CXX = g++-10
   - provider: pypi
     username: "__token__"
     skip_existing: true

.zenodo.json

@@ -1,64 +1,68 @@
 {
-	"description": "PROPOSAL is a Monte-Carlo-Simulation library to propagate Leptons through media.",
+	"description": "PROPOSAL is a Monte-Carlo-Simulation library to propagate leptons and high energy photons through media.",
 	"license": "lgpl-3.0",
 	"keywords": ["Monte-Carlo Simulation", "Lepton Propagator", "Cross Sections"],
 	"upload_type": "software",
 	"creators": [
 		{
 			"affiliation": "TU Dortmund",
-			"name": "Mario Dunsch"
+			"name": "Jean-Marco Alameddine"
 		},
 		{
 			"affiliation": "TU Dortmund",
-			"name": "Jan Soedingrekso"
+			"name": "Mario Dunsch"
 		},
 		{
 			"affiliation": "TU Dortmund",
-			"name": "Jan-Hendrik K\u00f6hne"
+			"name": "Tomasz Fuchs"
 		},
 		{
 			"affiliation": "TU Dortmund",
-			"name": "Tomasz Fuchs"
+			"name": "Pascal Gutjahr"
 		},
 		{
 			"affiliation": "TU Dortmund",
-			"name": "Jean-Marco Alameddine"
+			"name": "Jan-Hendrik K\u00f6hne"
 		},
 		{
-			"affiliation": "TU Dortmund",
-			"name": "Maximilian Sackel"
+			"affiliation": "University of Alberta",
+			"name": "Claudio Kopper"
 		},
 		{
-			"affiliation": "DESY Zeuthen",
-			"name": "Jacob van Santen"
+			"affiliation": "TU M\u00fcnchen",
+			"name": "Kai Krings"
 		},
 		{
-			"affiliation": "TU Dortmund",
-			"name": "Maximilian N\u00f6the"
+			"affiliation": "National Taiwan University",
+			"name": "Chung-Yun Kuo"
 		},
 		{
 			"affiliation": "TU Dortmund",
 			"name": "Thorben Menne"
 		},
 		{
 			"affiliation": "TU Dortmund",
-			"name": "Alexander Sandrock"
+			"name": "Maximilian N\u00f6the"
 		},
 		{
-			"affiliation": "National Taiwan University",
-			"name": "Chung-Yun Kuo"
+			"affiliation": "University of Maryland",
+			"name": "Alex Olivas"
 		},
 		{
-			"affiliation": "University of Alberta",
-			"name": "Claudio Kopper"
+			"affiliation": "TU Dortmund",
+			"name": "Maximilian Sackel"
 		},
 		{
-			"affiliation": "TU M\u00fcnchen",
-			"name": "Kai Krings"
+			"affiliation": "TU Dortmund",
+			"name": "Alexander Sandrock"
 		},
 		{
-			"affiliation": "University of Maryland",
-			"name": "Alex Olivas"
+			"affiliation": "TU Dortmund",
+			"name": "Jan Soedingrekso"
+		},
+		{
+			"affiliation": "DESY Zeuthen",
+			"name": "Jacob van Santen"
 		}
 	],
 	"access_right": "open"

CMakeLists.txt

@@ -1,15 +1,54 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.9)
 
-project(PROPOSAL VERSION 6.1.6 LANGUAGES CXX)
+set(PROPOSAL_VERSION_MAJOR 7)
+set(PROPOSAL_VERSION_MINOR 0)
+set(PROPOSAL_VERSION_PATCH 0)
+set(PROPOSAL_VERSION ${PROPOSAL_VERSION_MAJOR}.${PROPOSAL_VERSION_MINOR}.${PROPOSAL_VERSION_PATCH})
 
+project(PROPOSAL
+    VERSION ${PROPOSAL_VERSION}
+    LANGUAGES CXX
+    DESCRIPTION "The very best photon and lepton propagator."
+    )
 
-IF(I3_PROJECTS)
-	add_definitions(-DICECUBE_PROJECT)
-    include(cmake/I3_CMakeLists.cmake)
-ELSE(I3_PROJECTS)
-	add_definitions(-DPROPOSAL_STANDALONE)
-    include(cmake/Standalone_CMakeLists.cmake)
-ENDIF(I3_PROJECTS)
+if (EXISTS ${CMAKE_BINARY_DIR}/conan_paths.cmake)
+    include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
+endif()
 
-# Just for auto formating code
-include(cmake/clang_cxx_dev_tools.cmake)
+if(NOT CMAKE_BUILD_TYPE)
+  message(STATUS "No build type has been specified. Using default system build type. You may want to change this to"
+  	"'Release' if you are using PROPOSAL for production purposes.")
+else()
+	if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+  		message(WARNING "Build type set to ${CMAKE_BUILD_TYPE}. This build type should only be used for development"
+  			"and debugging purposes and not for production since the runtime of PROPOSAL with be significantly higher!")
+  	else()
+		message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.")
+  	endif()
+endif()
+
+
+set(CMAKE_CXX_STANDARD 14)
+
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_INLINES_HIDDEN YES)
+
+option(BUILD_PYTHON "build python interface" OFF)
+option(BUILD_EXAMPLE "build example" OFF)
+option(BUILD_DOCUMENTATION "build documentation" OFF)
+option(BUILD_TESTING "build testing" OFF)
+
+add_subdirectory(src)
+
+if(BUILD_EXAMPLE)
+    add_subdirectory(example)
+endif()
+
+if(BUILD_DOCUMENTATION)
+    add_subdirectory(docs)
+endif()
+
+if(BUILD_TESTING)
+    enable_testing()
+    add_subdirectory(tests)
+endif()