cmake/FindPythia8.cmake

@@ -3,9 +3,8 @@
 #
 # See file AUTHORS for a list of contributors.
 #
-# This software is distributed under the terms of the GNU General Public
-# Licence version 3 (GPL Version 3). See file LICENSE for a full version of
-# the license.
+# This software is distributed under the terms of the 3-clause BSD license.
+# See file LICENSE for a full version of the license.
 #
 
 #################################################

cmake/FindSphinx.cmake

@@ -3,9 +3,8 @@
 #
 # See file AUTHORS for a list of contributors.
 #
-# This software is distributed under the terms of the GNU General Public
-# Licence version 3 (GPL Version 3). See file LICENSE for a full version of
-# the license.
+# This software is distributed under the terms of the 3-clause BSD license.
+# See file LICENSE for a full version of the license.
 #
 
 # Look for an executable called sphinx-build

cmake/corsikaConfig.cmake.in

@@ -3,9 +3,8 @@
 #
 # See file AUTHORS for a list of contributors.
 #
-# This software is distributed under the terms of the GNU General Public
-# Licence version 3 (GPL Version 3). See file LICENSE for a full version of
-# the license.
+# This software is distributed under the terms of the 3-clause BSD license.
+# See file LICENSE for a full version of the license.
 #
 
 set (CORSIKA8_VERSION @c8_version@)
@@ -31,10 +30,16 @@ set (COMPILE_OPTIONS @COMPILE_OPTIONS@)
 set (CMAKE_VERBOSE_MAKEFILE  @CMAKE_VERBOSE_MAKEFILE@) 
 
 #+++++++++++++++++++++++++++++
-# Setup external dependencies via conan
+# external dependencies
+# same list as top-level CML.txt, except for Catch2 (not needed here)
 #
-include (${CMAKE_CURRENT_LIST_DIR}/conanbuildinfo.cmake)
-conan_basic_setup (TARGETS)
+find_package(Boost COMPONENTS filesystem REQUIRED)
+find_package(CLI11 REQUIRED)
+find_package(Eigen3 REQUIRED)
+find_package(spdlog REQUIRED)
+find_package(yaml-cpp REQUIRED)
+find_package(Arrow REQUIRED)
+find_package(PROPOSAL REQUIRED)
 
 #+++++++++++++++++++++++++++++
 # Import Pythia8
@@ -51,6 +56,35 @@ set_target_properties (
 set (Pythia8_FOUND @Pythia8_FOUND@)
 message (STATUS "Pythia8 at: @Pythia8_PREFIX@")
 
+#+++++++++++++++++++++++++++++
+# Import TAUOLA
+# since we always import TAUOLA (ExternalProject_Add) we have to
+# import here, too.
+#
+add_library (C8::ext::tauola::CxxInterface STATIC IMPORTED GLOBAL)
+add_library (C8::ext::tauola::Fortran STATIC IMPORTED GLOBAL)
+add_library(C8::ext::tauola INTERFACE IMPORTED)
+set_property(TARGET C8::ext::tauola 
+    PROPERTY
+    INTERFACE_LINK_LIBRARIES 
+    C8::ext::tauola::CxxInterface
+    C8::ext::tauola::Fortran)
+set_target_properties (
+  C8::ext::tauola::CxxInterface PROPERTIES
+  IMPORTED_LOCATION @TAUOLA_LIBDIR@/libTauolaCxxInterface.a
+  IMPORTED_LINK_INTERFACE_LIBRARIES dl
+  INTERFACE_INCLUDE_DIRECTORIES @TAUOLA_INCDIR@
+  )
+set_target_properties (
+  C8::ext::tauola::Fortran PROPERTIES
+  IMPORTED_LOCATION @TAUOLA_LIBDIR@/libTauolaFortran.a
+  IMPORTED_LINK_INTERFACE_LIBRARIES dl
+  INTERFACE_INCLUDE_DIRECTORIES @TAUOLA_INCDIR@
+  )
+
+set (TAUOLA_FOUND @TAUOLA_FOUND@)
+message (STATUS "TAUOLA at: @TAUOLA_PREFIX@")
+
 
 #++++++++++++++++++++++++++++++
 # import CORSIKA8

cmake/corsikaDefines.cmake

@@ -3,9 +3,8 @@
 #
 # See file AUTHORS for a list of contributors.
 #
-# This software is distributed under the terms of the GNU General Public
-# Licence version 3 (GPL Version 3). See file LICENSE for a full version of
-# the license.
+# This software is distributed under the terms of the 3-clause BSD license.
+# See file LICENSE for a full version of the license.
 #
 
 
@@ -24,7 +23,7 @@ set (CMAKE_CXX_FLAGS_COVERAGE "-g --coverage")
 set (CMAKE_EXE_LINKER_FLAGS_COVERAGE "--coverage")
 set (CMAKE_SHARED_LINKER_FLAGS_COVERAGE "--coverage")
 # set a flag to inform code that we are in debug mode
-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_C8_DEBUG_")
 
 
 #+++++++++++++++++++++++++++++

cmake/corsikaUtilities.cmake

@@ -3,9 +3,8 @@
 #
 # See file AUTHORS for a list of contributors.
 #
-# This software is distributed under the terms of the GNU General Public
-# Licence version 3 (GPL Version 3). See file LICENSE for a full version of
-# the license.
+# This software is distributed under the terms of the 3-clause BSD license.
+# See file LICENSE for a full version of the license.
 #
 
 #################################################
@@ -55,9 +54,10 @@ function (CORSIKA_ADD_TEST)
   else ()
     set(sanitize ${C8_ADD_TEST_SANITIZE})
   endif ()
-
+ 
+  find_package(Catch2 REQUIRED)
   add_executable (${name} ${sources})
-  target_link_libraries (${name} CORSIKA8 CONAN_PKG::catch2 CorsikaTestingCommon)
+  target_link_libraries (${name} CORSIKA8 Catch2::Catch2WithMain CorsikaTestingCommon)
   target_compile_options (${name} PRIVATE -g) # do not skip asserts
   target_include_directories (${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
   file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test_outputs/)

conan-install.sh

+#!/bin/bash
+
+
+function show_usage(){
+    printf "\n\nUsage:"
+    printf "$0 options [parameters]\n"
+    printf "\n"
+    printf "Options:\n"
+    printf "\n -s or --source-directory:\n Corsika 8 download directory, which contains the 'conanfile.py' recipe. Default is the current directory."
+    printf "\n -d or --debug:\n Specify 'Debug' as build type for the installed dependences. This should be matched when building CORSIKA 8."
+    printf "\n -r or --release:\n Specify 'Release' as build type for the installed dependences. This should be matched when building CORSIKA 8."
+    printf "\n -rd or --release-with-debug:\n Specify 'RelWithDebInfo' as build type for the installed dependences. This should be matched when building CORSIKA 8."
+    printf "\n\nExample: ./conan-install.sh --source-directory /some_path/corsika --debug"
+    printf "\n -h or --help:\n Prints this message.\n"
+
+exit 0
+}
+
+echo "|---------------------------------------------------|"
+echo "|-----------------[ CORSIKA 8 ]---------------------|"
+echo "|-----[ CONAN2 DEPENDENCIES INSTALL SCRIPT ]------- |"
+echo "|---------------------------------------------------|"
+echo "|-------------------- BEGIN ------------------------| "
+
+echo " "
+
+SOURCE=${BASH_SOURCE[0]}
+while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+  SOURCE=$(readlink "$SOURCE")
+  [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+
+SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
+
+BUILD_TYPE="RelWithDebInfo"
+CORSIKA_DIR=${CURRENT_DIR}
+CORSIKA_DIR_INFORMED=${CURRENT_DIR}
+CONAN2_OUTPUT_FOLDER_NAME="conan_cmake"
+
+printf "[ conan-install | info > This script is located at the directory: ${SCRIPT_DIR}\n"
+
+
+
+if [[ "$1" == "--help" ]] || [[ "$1" == "-h" ]];then
+    show_usage
+fi
+
+while [ ! -z "$1" ]; do
+  case "$1" in
+     --source-directory|-s)
+         shift
+         CORSIKA_DIR=$(readlink -e ${1})
+         CORSIKA_DIR_INFORMED=${1}
+         ;;
+     --debug|-d)
+         #shift
+         BUILD_TYPE="Debug"
+         ;;
+     --release|-r)
+         #shift
+         BUILD_TYPE="Release"
+         ;;
+     --release-with-debug|-rd)
+         #shift
+         BUILD_TYPE="RelWithDebInfo"
+         ;;
+      --help|-h)
+        #shift
+         show_usage
+         ;;
+     *)
+        show_usage
+        ;;
+  esac
+if [ $# -gt 0 ]; then
+shift
+fi
+done
+
+if [[ ${#CORSIKA_DIR} -eq 0 ]]; then
+  printf "[ conan-install | warning > Output folder for cmake scripts generated by conan2 not found.\n"
+  printf "[ conan-install | warning > Directory '${CORSIKA_DIR_INFORMED}' does not exist.\n"
+  exit 1
+fi
+
+
+if [ -d "${CORSIKA_DIR}/${CONAN2_OUTPUT_FOLDER_NAME}" ]; then
+  printf "[ conan-install | info > Output folder for cmake scripts generated by conan2 is: ${CORSIKA_DIR}/${CONAN2_OUTPUT_FOLDER_NAME}\n"
+else
+  printf "[ conan-install | warning > Output folder for cmake scripts generated by conan2 not found.\n"
+  printf "[ conan-install | warning > Creating directory  ${CORSIKA_DIR}/${CONAN2_OUTPUT_FOLDER_NAME}.\n"
+  mkdir -p "${CORSIKA_DIR}/${CONAN2_OUTPUT_FOLDER_NAME}"
+fi
+
+if [ -f "${CORSIKA_DIR}/conanfile.py" ]; then
+  printf "[ conan-install | info > conan2 recipe: ${CORSIKA_DIR}/conanfile.py\n"
+else
+  printf "[ conan-install | warning > conan2 recipe not found.\n"
+  printf "[ conan-install | warning > File  '${CORSIKA_DIR}/conanfile.py' does not exist.\n"
+  exit 1 
+fi
+
+# Conan2 variabes
+CONAN2_HOME=$(readlink -e `conan config home`)
+CONAN2_PROFILE_NAME="corsika8"
+printf "[ conan-install | info > conan2 home: ${CONAN2_HOME}\n"
+
+# Conan2 commands 
+CONAN2_DEFAULT_PROFILE_COMMAND="conan profile detect --force"
+CONAN2_PROFILE_COMMAND="conan profile detect --name ${CONAN2_PROFILE_NAME} --force"
+CONAN2_INSTALL_COMMAND="conan install ${CORSIKA_DIR} --output-folder=${CORSIKA_DIR}/${CONAN2_OUTPUT_FOLDER_NAME} --build=missing  --settings=build_type=${BUILD_TYPE} --profile=${CONAN2_PROFILE_NAME}"
+CONAN2_SHOW_PROFLE_COMMAND="conan profile show -pr ${CONAN2_PROFILE_NAME}"
+
+printf "[ conan-install | info > Creating default profile...\n\n"
+eval $CONAN2_DEFAULT_PROFILE_COMMAND
+if [ ! $? -eq 0 ]; then 
+	printf "[ conan-install | error > Exit code 126 (Command invoked cannot execute):\n ${CONAN2_DEFAULT_PROFILE_COMMAND}.\n"
+	exit 126
+fi	
+
+printf "[ conan-install | info > Creating '${CONAN2_PROFILE_NAME}' profile...\n\n"
+eval $CONAN2_PROFILE_COMMAND
+if [ ! $? -eq 0 ]; then 
+	printf "[ conan-install | error > Exit code 126 (Command invoked cannot execute):\n ${CONAN2_PROFILE_COMMAND}.\n"
+	exit 126
+fi	
+
+printf "\n\n[ conan-install | info > Editing '${CONAN2_PROFILE_NAME}' profile\n"
+
+#========== cppstd setting ============
+STD_NUMBER=`grep -n -m 1 "compiler.cppstd=" ${CONAN2_HOME}/profiles/${CONAN2_PROFILE_NAME} | cut -d: -f1`
+SED_STD_COMMAND="sed -i '${STD_NUMBER}s/.*/compiler.cppstd=gnu17/' ${CONAN2_HOME}/profiles/${CONAN2_PROFILE_NAME}"
+
+eval $SED_STD_COMMAND
+if [ ! $? -eq 0 ]; then 
+	printf "[ conan-install | error > Exit code 126 (Command invoked cannot execute):\n ${SED_STD_COMMAND}\n"
+	exit 126
+fi	
+
+#========== libcxx setting ============
+CXX_NUMBER=`grep -n -m 1 "compiler.libcxx=" ${CONAN2_HOME}/profiles/${CONAN2_PROFILE_NAME} | cut -d: -f1`
+SED_CXX_COMMAND="sed -i '${CXX_NUMBER}s/.*/compiler.libcxx=libstdc++11/' ${CONAN2_HOME}/profiles/${CONAN2_PROFILE_NAME}"
+
+eval $SED_CXX_COMMAND
+if [ ! $? -eq 0 ]; then 
+	printf "[ conan-install | error > Exit code 126 (Command invoked cannot execute):\n ${SED_CXX_COMMAND}\n"
+	exit 126
+fi	
+
+eval $CONAN2_SHOW_PROFLE_COMMAND
+if [ ! $? -eq 0 ]; then 
+	printf "[ conan-install | error > Exit code 126 (Command invoked cannot execute):\n ${CONAN2_SHOW_PROFLE_COMMAND}\n"
+	exit 126
+fi	
+
+printf "[ conan-install | info > ${CONAN2_INSTALL_COMMAND}\n"
+
+eval ${CONAN2_INSTALL_COMMAND}
+if [ ! $? -eq 0 ]; then 
+	printf "[ conan-install | error > Exit code 126 (Command invoked cannot execute):\n ${CONAN2_INSTALL_COMMAND}\n"
+	exit 126
+fi	
+
+CORSIKA_CMAKE_SCRIPT="#!/bin/bash
+
+
+function show_usage(){
+    printf \"\n\nUsage:\"
+    printf \"\$0 options [parameters]\n\"
+    printf \"\n\"
+    printf \"Options:\n\"
+    printf \"\n -c or --cmake-flags:\n Additional flags and settings to cmake base command. Default is empty string.\"
+    printf \"\n\nExample: ./corsika-cmake.sh --cmake-flags '-DUSE_Pythia8_C8=C8' \"
+    printf \"\n\nNote: the source directory (the one containing CMakeLists.txt), CMAKE_BUILD_TYPE, CMAKE_POLICY_DEFAULT_CMP0091 and CMAKE_TOOLCHAIN_FILE are already set. Do not repeat them.\"
+    printf \"\n -h or --help:\n Prints this message.\n\"
+
+exit 0
+}
+
+echo \"|---------------------------------------------------|\"
+echo \"|-----------------[ CORSIKA 8 ]---------------------|\"
+echo \"|----------[ CMAKE CONFIGURATION SCRIPT ]---------- |\"
+echo \"|---------------------------------------------------|\"
+echo \"|-------------------- BEGIN ------------------------|\"
+
+CMAKE_BASE_SETTINGS=\"cmake  -S ${CORSIKA_DIR} -D CONAN_CMAKE_DIR=${CORSIKA_DIR}/${CONAN2_OUTPUT_FOLDER_NAME} -D CMAKE_TOOLCHAIN_FILE=${CORSIKA_DIR}/${CONAN2_OUTPUT_FOLDER_NAME}/conan_toolchain.cmake  -D CMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${BUILD_TYPE}\"
+CMAKE_ADDITIONAL_SETTINGS=\"\"
+
+if [[ \"\$1\" == \"--help\" ]] || [[ \"\$1\" == \"-h\" ]];then
+    show_usage
+fi
+
+while [ ! -z \"\$1\" ]; do
+  case \"\$1\" in
+     --cmake-flags|-c)
+         shift
+         CMAKE_ADDITIONAL_SETTINGS=\${1}
+         ;;
+      --help|-h)
+        #shift
+         show_usage
+         ;;
+     *)
+        show_usage
+        ;;
+  esac
+if [ \$# -gt 0 ]; then
+shift
+fi
+done
+
+printf \"[corsika-cmake | info >  Issuing CMake command :\n\"
+printf '[corsika-cmake | info > \e[1;36m%s\e[0m\n\n\n' \"\${CMAKE_BASE_SETTINGS} \${CMAKE_ADDITIONAL_SETTINGS}\"
+
+eval \"\${CMAKE_BASE_SETTINGS} \${CMAKE_ADDITIONAL_SETTINGS}\"
+
+if [ ! \$? -eq 0 ]; then 
+	printf \"[ corsika | error > Project configuration (CMake) failed. \n\"
+	exit 1
+fi
+
+echo \"|---------------------------------------------------|\"
+echo \"|-----------------[ CORSIKA 8 ]---------------------|\"
+echo \"|----------[ CMAKE CONFIGURATION SCRIPT ]---------- |\"
+echo \"|---------------------------------------------------|\"
+echo \"|-------------------- END --------------------------|\"
+"
+
+printf "%s" "${CORSIKA_CMAKE_SCRIPT}" > ${SCRIPT_DIR}/corsika-cmake.sh
+chmod +x ${SCRIPT_DIR}/corsika-cmake.sh
+
+printf "\n\n[ conan-install | info > Copy and paste the commands below in the corsika-build directory:\n\n"
+printf '\e[1;36m%s\e[0m\n' "> ${SCRIPT_DIR}/corsika-cmake.sh "
+printf '\e[1;36m%s\e[0m\n' "> make -j8"
+
+echo " "
+echo "|---------------------------------------------------|"
+echo "|-----------------[ CORSIKA 8 ]---------------------|"
+echo "|-----[ CONAN2 DEPENDENCIES INSTALL SCRIPT ]------- |"
+echo "|---------------------------------------------------|"
+echo "|-------------------- END --------------------------| "
+echo " "
+
+exit 0

conanfile.py

+from conan import ConanFile
+from conan.tools.cmake import cmake_layout,CMakeToolchain, CMakeDeps
+
+class Pkg(ConanFile):
+    generators = "CMakeDeps", #"CMakeToolchain",
+    settings = "os", "arch", "compiler", "build_type"
+    default_options = {
+		'readline*:shared': 'True',
+		'arrow*:shared': 'False',
+		'arrow*:parquet': 'True',
+		'arrow*:fPIC': 'False',
+		'arrow*:with_re2': 'True',
+		'arrow*:with_protobuf': 'False',
+		'arrow*:with_openssl': 'False',
+		'arrow*:with_gflags': 'False',
+		'arrow*:with_glog': 'False',
+		'arrow*:with_grpc': 'False',
+		'arrow*:with_utf8proc': 'False',
+		'arrow*:with_zstd': 'False',
+		'arrow*:with_bz2': 'False',
+		'arrow*:with_lz4': 'True',
+		'arrow*:with_thrift': 'True',
+		'arrow*:with_boost': 'True',
+		'boost*:without_container': 'True',
+		'boost*:without_context': 'True',
+		'boost*:without_contract': 'True',
+		'boost*:without_coroutine': 'True',
+		'boost*:without_date_time': 'True',
+		'boost*:without_fiber': 'True',
+		'boost*:without_filesystem': 'False',
+		'boost*:without_graph': 'True',
+		'boost*:without_graph_parallel': 'True',
+		'boost*:without_iostreams': 'False',
+		'boost*:without_json': 'True',
+		'boost*:without_locale': 'True',
+		'boost*:without_log': 'True',
+		'boost*:without_math': 'False',
+		'boost*:without_mpi': 'True',
+		'boost*:without_nowide': 'True',
+		'boost*:without_program_options': 'True',
+		'boost*:without_python': 'True',
+		'boost*:without_serialization': 'False',
+		'boost*:without_stacktrace': 'True',
+		'boost*:without_system': 'False',
+		'boost*:without_test': 'True',
+		'boost*:without_thread': 'True',
+		'boost*:without_timer': 'True',
+		'boost*:without_type_erasure': 'True',
+		'boost*:without_wave': 'True'
+}
+
+    def configure(self):
+        self.options['arrow'].with_boost = True
+        self.options['arrow'].parquet = True
+        self.options['arrow'].with_thrift = True
+        
+    def requirements(self):
+        self.requires("spdlog/1.14.1", force=True)
+        self.requires("catch2/3.6.0")
+        self.requires("bzip2/1.0.8")
+        self.requires("boost/1.85.0", force=True)
+        self.requires("eigen/3.4.0")
+        self.requires("zlib/1.3.1")
+        self.requires("yaml-cpp/0.8.0")
+        self.requires("cli11/1.9.1")
+        self.requires("arrow/16.1.0")
+        self.requires("proposal/7.6.2")
+
+    def build_requirements(self):
+        self.tool_requires("readline/8.0")
+        self.tool_requires("bison/[>1.0]")
+        
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.absolute_paths = True
+        tc.generate()
+        
+

conanfile.txt

-[requires]
-readline/8.0 # this is only needed to fix a missing dependency in "bison" which is pulled-in by arrow
-spdlog/1.8.5
-catch2/2.13.3
-eigen/3.3.8
-boost/1.76.0
-zlib/1.2.11
-proposal/7.0.4
-yaml-cpp/0.6.3
-arrow/2.0.0
-
-[generators]
-cmake
-
-[options]
-readline:shared=True
-arrow:shared=False
-arrow:parquet=True
-arrow:fPIC=False
-arrow:with_re2=False
-arrow:with_protobuf=False
-arrow:with_openssl=False
-arrow:with_gflags=False
-arrow:with_glog=False
-arrow:with_grpc=False
-arrow:with_utf8proc=False
-arrow:with_zstd=False
-arrow:with_bz2=False

corsika/corsika.hpp

-/*
- * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
-
-#pragma once
-
-/**
-  @file corsika.hpp
-
-  The CORSIKA 8 air shower simulation framework.
-
-  @mainpage Technical documentation of the CORSIKA 8 software framework
-
-  Software documentatin and reference guide for the CORSIKA 8
-  software framework for air shower simulations. CORSIKA 8 is developed
-  at <a href="https://gitlab.ikp.kit.edu/AirShowerPhysics">https://gitlab.ikp.kit.edu</a>.
-  If you got the code from somewhere else, consider to switch to the official development
-  repository. If you want to report bugs, or want to suggest features or future
-  development, please submit an "issue" on this gitlab server. We only accept Issues and
-  discussion via our central development server https://gitlab.ikp.kit.edu.
-
-  Write to corsika-devel@lists.kit.edu, or even register yourself at
-  https://www.lists.kit.edu/sympa/info/corsika-devel to get in contact
-  with other developers.
-
-  For more information about the project, see @ref md_README.
-  **/
-
-/*! Usage:
- *  to get the version X.YY.Z,
- *  set CORSIKA_VERSION X0YY0Z
- */
-#define CORSIKA_VERSION 800000
-
-/*! \def CORSIKA_MAJOR_VERSION
- *  \brief The preprocessor macro \p CORSIKA_MAJOR_VERSION encodes the
- *         major version number of CORSIKA.
- */
-#define CORSIKA_MAJOR_VERSION (CORSIKA_VERSION / 100000)
-
-/*! \def CORSIKA_MINOR_VERSION
- *  \brief The preprocessor macro \p CORSIKA_MINOR_VERSION encodes the
- *         minor version number of CORSIKA.
- */
-#define CORSIKA_MINOR_VERSION (CORSIKA_VERSION / 100 % 1000)
-
-/*! \def CORSIKA_PATCH_NUMBER
- *  \brief The preprocessor macro \p CORSIKA_PATCH_NUMBER encodes the
- *         patch number of the CORSIKA library.
- */
-#define CORSIKA_PATCH_NUMBER 0

corsika/detail/framework/analytics/ClassTimer.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 // Another possibility:

corsika/detail/framework/analytics/FunctionTimer.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 #pragma once
 

corsika/detail/framework/core/Logging.inl

-/* -*-c++-*-
+/*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/core/ParticleProperties.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once
 
 #include <cmath>
 #include <corsika/framework/core/PhysicalUnits.hpp>
+#include <corsika/framework/core/Logging.hpp>
 
 namespace corsika {
 
-  inline HEPEnergyType constexpr get_kinetic_energy_threshold(Code const p) {
-    return particle::detail::thresholds[static_cast<CodeIntType>(p)];
+  inline HEPEnergyType get_kinetic_energy_propagation_threshold(Code const code) {
+    if (is_nucleus(code)) return particle::detail::threshold_nuclei;
+    return particle::detail::propagation_thresholds[static_cast<CodeIntType>(code)];
   }
 
-  inline void constexpr set_kinetic_energy_threshold(Code const p,
-                                                     HEPEnergyType const val) {
-    particle::detail::thresholds[static_cast<CodeIntType>(p)] = val;
+  inline void set_kinetic_energy_propagation_threshold(Code const code,
+                                                       HEPEnergyType const val) {
+    if (is_nucleus(code))
+      particle::detail::threshold_nuclei = val;
+    else
+      particle::detail::propagation_thresholds[static_cast<CodeIntType>(code)] = val;
   }
 
-  inline HEPMassType constexpr get_mass(Code const p) {
-    if (p == Code::Nucleus)
-      throw std::runtime_error("Cannot GetMass() of particle::Nucleus -> unspecified");
-    return particle::detail::masses[static_cast<CodeIntType>(p)];
+  inline HEPMassType constexpr get_mass(Code const code) {
+    if (is_nucleus(code)) { return get_nucleus_mass(code); }
+    return particle::detail::masses[static_cast<CodeIntType>(code)];
   }
 
-  inline PDGCode constexpr get_PDG(Code const p) {
-    return particle::detail::pdg_codes[static_cast<CodeIntType>(p)];
+  inline HEPEnergyType get_energy_production_threshold(Code const p) {
+    return particle::detail::production_thresholds[static_cast<CodeIntType>(p)];
+  }
+
+  inline void set_energy_production_threshold(Code const p, HEPEnergyType const val) {
+    particle::detail::production_thresholds[static_cast<CodeIntType>(p)] = val;
+  }
+
+  inline bool constexpr is_charged(Code const c) { return get_charge_number(c) != 0; }
+
+  inline bool constexpr is_nucleus(Code const code) { return code >= Code::Nucleus; }
+
+  inline Code constexpr get_nucleus_code(size_t const A,
+                                         size_t const Z) { // 10LZZZAAAI
+    if (Z > A) { throw std::runtime_error("Z cannot be larger than A in nucleus."); }
+    return static_cast<Code>(static_cast<CodeIntType>(Code::Nucleus) + Z * 10000 +
+                             A * 10);
+  }
+
+  inline size_t constexpr get_nucleus_Z(Code const code) {
+    return (static_cast<CodeIntType>(code) % static_cast<CodeIntType>(Code::Nucleus)) /
+           10000;
+  }
+
+  inline size_t constexpr get_nucleus_A(Code const code) {
+    return (static_cast<CodeIntType>(code) % 10000) / 10;
+  }
+
+  inline PDGCode constexpr get_PDG(Code const code) {
+    if (code < Code::Nucleus) {
+      return particle::detail::pdg_codes[static_cast<CodeIntType>(code)];
+    }
+    size_t const Z = get_nucleus_Z(code);
+    size_t const A = get_nucleus_A(code);
+    return static_cast<PDGCode>(static_cast<CodeIntType>(Code::Nucleus) + Z * 10000 +
+                                A * 10); // 10LZZZAAAI
+  }
+
+  inline PDGCode constexpr get_PDG(unsigned int const A, unsigned int const Z) {
+    return PDGCode(1000000000 + Z * 10000 + A * 10);
   }
 
   inline int16_t constexpr get_charge_number(Code const code) {
-    if (code == Code::Nucleus)
-      throw std::runtime_error("charge of particle::Nucleus undefined");
+    if (is_nucleus(code)) return get_nucleus_Z(code);
     return particle::detail::electric_charges[static_cast<CodeIntType>(code)];
   }
 
   inline ElectricChargeType constexpr get_charge(Code const code) {
+    if (code == Code::Nucleus)
+      throw std::runtime_error("charge of particle::Nucleus undefined");
     return get_charge_number(code) * constants::e;
   }
 
   inline std::string_view constexpr get_name(Code const code) {
+    if (is_nucleus(code)) { return "nucleus"; }
     return particle::detail::names[static_cast<CodeIntType>(code)];
   }
 
+  inline std::string get_name(Code code, full_name) {
+    if (is_nucleus(code)) {
+      return fmt::format("nucleus ({},{})", get_nucleus_A(code), get_nucleus_Z(code));
+    }
+
+    return std::string{get_name(code)};
+  }
+
   inline TimeType constexpr get_lifetime(Code const p) {
     return particle::detail::lifetime[static_cast<CodeIntType>(p)] * second;
   }
 
-  inline bool constexpr is_hadron(Code const p) {
-    return particle::detail::isHadron[static_cast<CodeIntType>(p)];
+  inline bool constexpr is_hadron(Code const code) {
+    if (is_nucleus(code)) return true;
+    return particle::detail::isHadron[static_cast<CodeIntType>(code)];
   }
 
   inline bool constexpr is_em(Code const c) {
@@ -67,24 +119,6 @@ namespace corsika {
            c == Code::NuMuBar || c == Code::NuTauBar;
   }
 
-  inline int constexpr get_nucleus_A(Code const code) {
-    if (code == Code::Nucleus) {
-      throw std::runtime_error("get_nucleus_A(Code::Nucleus) is impossible!");
-    }
-    return particle::detail::nucleusA[static_cast<CodeIntType>(code)];
-  }
-
-  inline int constexpr get_nucleus_Z(Code const code) {
-    if (code == Code::Nucleus) {
-      throw std::runtime_error("get_nucleus_Z(Code::Nucleus) is impossible!");
-    }
-    return particle::detail::nucleusZ[static_cast<CodeIntType>(code)];
-  }
-
-  inline bool constexpr is_nucleus(Code const code) {
-    return (code == Code::Nucleus) || (get_nucleus_A(code) != 0);
-  }
-
   inline std::ostream& operator<<(std::ostream& stream, corsika::Code const code) {
     return stream << get_name(code);
   }
@@ -93,18 +127,36 @@ namespace corsika {
     static_assert(particle::detail::conversionArray.size() % 2 == 1);
     // this will fail, for the strange case where the maxPDG is negative...
     int constexpr maxPDG{(particle::detail::conversionArray.size() - 1) >> 1};
-    auto const k = static_cast<PDGCodeType>(p);
+    auto const k = static_cast<PDGCodeIntType>(p);
     if (std::abs(k) <= maxPDG) {
       return particle::detail::conversionArray[k + maxPDG];
     } else {
+      if (1000000000 <= k && k <= 1009999990) { // nucleus (no L or I)
+        int const Z = (k - 1000000000) / 10000;
+        int const A = (k - 1000000000 - 10000 * Z) / 10;
+        return get_nucleus_code(A, Z);
+      }
       return particle::detail::conversionMap.at(p);
     }
   }
 
-  inline HEPMassType get_nucleus_mass(unsigned int const A, unsigned int const Z) {
+  inline HEPMassType constexpr get_nucleus_mass(Code const code) {
+    unsigned int const A = get_nucleus_A(code);
+    unsigned int const Z = get_nucleus_Z(code);
+    return get_nucleus_mass(A, Z);
+  }
+
+  inline HEPMassType constexpr get_nucleus_mass(unsigned int const A,
+                                                unsigned int const Z) {
     return get_mass(Code::Proton) * Z + (A - Z) * get_mass(Code::Neutron);
   }
 
+  inline std::string get_nucleus_name(Code const code) {
+    size_t const A = get_nucleus_A(code);
+    size_t const Z = get_nucleus_Z(code);
+    return fmt::format("Nucleus_A{}_Z{}", A, Z);
+  }
+
   inline std::initializer_list<Code> constexpr get_all_particles() {
     return particle::detail::all_particles;
   }

corsika/detail/framework/core/SpdlogSpecializations.inl

+/*
+ * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
+ */
+
+#pragma once
+
+#include <fmt/format.h>
+#include <corsika/framework/core/ParticleProperties.hpp>
+#include <boost/filesystem/path.hpp>
+#include <corsika/framework/core/PhysicalUnits.hpp>
+#include <Eigen/Dense>
+
+//-----------------------------------
+// STD
+//-----------------------------------
+namespace std {
+
+  auto inline format_as(std::_Put_time<char> const& arg) {
+    std::ostringstream os;
+    os << arg;
+    return os.str();
+  }
+
+} // namespace std
+
+//-----------------------------------
+// CORSIKA
+//-----------------------------------
+namespace corsika {
+
+  // formatters for particle codes declared on ParticleProperties.hpp
+  auto inline format_as(Code code) { return get_name(code); }
+  auto inline format_as(PDGCode code) { return fmt::underlying(code); }
+
+  template <typename Type>
+  auto inline format_as(Type const& arg) {
+    std::ostringstream os;
+    os << arg;
+    return os.str();
+  }
+
+} // namespace corsika
+
+//-----------------------------------
+// boost::filesystem
+//-----------------------------------
+namespace boost::filesystem {
+
+  auto inline format_as(path const& fname) { return fname.string().c_str(); }
+
+} // namespace boost::filesystem
+
+//-----------------------------------
+// phys::units
+//-----------------------------------
+namespace phys::units {
+
+  template <typename Dimensions>
+  auto inline format_as(phys::units::quantity<Dimensions> const& arg) {
+
+    return io::to_string(arg);
+  }
+
+} // namespace phys::units
+
+//----------------------------------
+// Eigen
+//----------------------------------
+namespace Eigen {
+
+  template <typename Scalar, int M, int N>
+  auto inline format_as(Matrix<Scalar, M, N> const& arg) {
+
+    std::ostringstream os;
+    os << arg;
+    return os.str();
+  }
+
+  template <typename Matrix1, typename Matrix2>
+  auto inline format_as(Product<Matrix1, Matrix2> const& arg) {
+
+    std::ostringstream os;
+    os << arg;
+    return os.str();
+  }
+
+} // namespace Eigen

corsika/detail/framework/geometry/BaseVector.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once

corsika/detail/framework/geometry/Box.inl

+/*
+ * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
+ */
+
+#pragma once
+
+namespace corsika {
+  inline Box::Box(CoordinateSystemPtr cs, LengthType const x, LengthType const y,
+                  LengthType const z)
+      : center_(Point(cs, {0_m, 0_m, 0_m}))
+      , cs_(cs)
+      , x_(x)
+      , y_(y)
+      , z_(z) {}
+
+  inline Box::Box(CoordinateSystemPtr cs, LengthType const side)
+      : center_(Point(cs, {0_m, 0_m, 0_m}))
+      , cs_(cs)
+      , x_(side / 2)
+      , y_(side / 2)
+      , z_(side / 2) {}
+
+  inline bool Box::contains(Point const& p) const {
+    if ((abs(p.getX(cs_)) < x_) && (abs(p.getY(cs_)) < y_) && (abs(p.getZ(cs_)) < z_))
+      return true;
+    else
+      return false;
+  }
+
+  inline std::string Box::asString() const {
+    std::ostringstream txt;
+    txt << "center=" << center_ << ", x-axis=" << DirectionVector{cs_, {1, 0, 0}}
+        << ", y-axis: " << DirectionVector{cs_, {0, 1, 0}}
+        << ", z-axis: " << DirectionVector{cs_, {0, 0, 1}};
+    return txt.str();
+  }
+
+  template <typename TDim>
+  inline void Box::rotate(QuantityVector<TDim> const& axis, double const angle) {
+    cs_ = make_rotation(cs_, axis, angle);
+  }
+
+} // namespace corsika
\ No newline at end of file

corsika/detail/framework/geometry/CoordinateSystem.inl

 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once
@@ -75,13 +74,19 @@ namespace corsika {
   inline CoordinateSystemPtr make_translation(CoordinateSystemPtr const& cs,
                                               QuantityVector<length_d> const& vector) {
     EigenTransform const translation{EigenTranslation(vector.getEigenVector())};
-    return std::make_shared<CoordinateSystem const>(CoordinateSystem(cs, translation));
+    return CoordinateSystemPtr{new CoordinateSystem(cs, translation)};
   }
 
   template <typename TDim>
   inline CoordinateSystemPtr make_rotationToZ(CoordinateSystemPtr const& cs,
                                               Vector<TDim> const& vVec) {
-    auto const a = vVec.normalized().getComponents(cs).getEigenVector();
+    auto const vVecComp = vVec.getComponents(cs);
+    if (vVecComp.getX().magnitude() == 0 && vVecComp.getY().magnitude() == 0 &&
+        vVecComp.getZ().magnitude() == 0) {
+      return cs;
+    }
+
+    auto const a = vVecComp.normalized().getEigenVector();
     auto const a1 = a(0), a2 = a(1), a3 = a(2);
 
     Eigen::Matrix3d A, B;
@@ -105,8 +110,7 @@ namespace corsika {
           0, 0, (a1 * a1 + a2 * a2) * c;  // .
     }
 
-    return std::make_shared<CoordinateSystem const>(
-        CoordinateSystem(cs, EigenTransform(A + B)));
+    return CoordinateSystemPtr{new CoordinateSystem{cs, EigenTransform{A + B}}};
   }
 
   template <typename TDim>
@@ -120,7 +124,7 @@ namespace corsika {
     EigenTransform const rotation{
         Eigen::AngleAxisd(angle, axis.getEigenVector().normalized())};
 
-    return std::make_shared<CoordinateSystem const>(CoordinateSystem(cs, rotation));
+    return CoordinateSystemPtr{new CoordinateSystem{cs, rotation}};
   }
 
   template <typename TDim>
@@ -135,7 +139,7 @@ namespace corsika {
         Eigen::AngleAxisd(angle, axis.getEigenVector().normalized()) *
         EigenTranslation(translation.getEigenVector())};
 
-    return std::make_shared<CoordinateSystem const>(CoordinateSystem(cs, transf));
+    return CoordinateSystemPtr{new CoordinateSystem{cs, transf}};
   }
 
 } // namespace corsika

corsika/detail/framework/geometry/FourVector.inl

 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
+ * This software is distributed under the terms of the 3-clause BSD license.
+ * See file LICENSE for a full version of the license.
  */
 
 #pragma once