From deb450fd1e1924611491852966d097884626db6b Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Thu, 16 Jul 2020 21:38:13 +0200 Subject: [PATCH] remove demo CONEX process --- Processes/CMakeLists.txt | 1 - Processes/CONEX/CMakeLists.txt | 69 ---------------------------------- Processes/CONEX/CONEX.cc | 15 -------- Processes/CONEX/CONEX.h | 22 ----------- Processes/CONEX/testConex.cc | 54 -------------------------- 5 files changed, 161 deletions(-) delete mode 100644 Processes/CONEX/CMakeLists.txt delete mode 100644 Processes/CONEX/CONEX.cc delete mode 100644 Processes/CONEX/CONEX.h delete mode 100644 Processes/CONEX/testConex.cc diff --git a/Processes/CMakeLists.txt b/Processes/CMakeLists.txt index db26a4b5b..08c5dca48 100644 --- a/Processes/CMakeLists.txt +++ b/Processes/CMakeLists.txt @@ -9,7 +9,6 @@ if (Pythia8_FOUND) add_subdirectory (Pythia) endif (Pythia8_FOUND) if (CONEX_FOUND) - add_subdirectory (CONEX) add_subdirectory (CONEXSourceCut) endif (CONEX_FOUND) add_subdirectory (HadronicElasticModel) diff --git a/Processes/CONEX/CMakeLists.txt b/Processes/CONEX/CMakeLists.txt deleted file mode 100644 index 3f2ef6fd8..000000000 --- a/Processes/CONEX/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -set ( - MODEL_SOURCES - CONEX.cc - ) - -set ( - MODEL_HEADERS - CONEX.h - ) - -set ( - MODEL_NAMESPACE - corsika/process/conex - ) - -add_library (ProcessConex STATIC ${MODEL_SOURCES}) -CORSIKA_COPY_HEADERS_TO_NAMESPACE (ProcessConex ${MODEL_NAMESPACE} ${MODEL_HEADERS}) - - -set_target_properties ( - ProcessConex - PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION 1 - ) - -# target dependencies on other libraries (also the header onlys) -target_link_libraries ( - ProcessConex - CORSIKAprocesssequence - CORSIKAparticles - CORSIKAutilities - CORSIKAunits - CORSIKAgeometry - CORSIKAenvironment - CORSIKAsetup - CORSIKArandom - CorsikaData - C8::ext::conex - ) - -target_include_directories ( - ProcessConex - INTERFACE - $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> - $<INSTALL_INTERFACE:include/include> - ) - -install ( - TARGETS ProcessConex - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - ) - - -# -------------------- -# code unit testing - -CORSIKA_ADD_TEST(testConex - SOURCES - testConex.cc - ${MODEL_HEADERS} -) -target_link_libraries ( - testConex - ProcessConex - CORSIKAtesting - ) - diff --git a/Processes/CONEX/CONEX.cc b/Processes/CONEX/CONEX.cc deleted file mode 100644 index 111bbd367..000000000 --- a/Processes/CONEX/CONEX.cc +++ /dev/null @@ -1,15 +0,0 @@ -/* - * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu - * - * 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. - */ - -#include <corsika/process/conex/CONEX.h> - -using namespace corsika::process::CONEX; - -conex::conex() {} diff --git a/Processes/CONEX/CONEX.h b/Processes/CONEX/CONEX.h deleted file mode 100644 index 5e63e675d..000000000 --- a/Processes/CONEX/CONEX.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu - * - * 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. - */ - -#pragma once - -//#include <ConexDynamicInterface.h> - -namespace corsika::process::CONEX { - - class conex { - public: - conex(); - }; - -} // namespace corsika::process::CONEX diff --git a/Processes/CONEX/testConex.cc b/Processes/CONEX/testConex.cc deleted file mode 100644 index 73d97b574..000000000 --- a/Processes/CONEX/testConex.cc +++ /dev/null @@ -1,54 +0,0 @@ -/* - * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu - * - * 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. - */ - -#include <corsika/process/conex/CONEX.h> - -#include <corsika/random/RNGManager.h> - -#include <corsika/particles/ParticleProperties.h> - -#include <corsika/geometry/Point.h> -#include <corsika/units/PhysicalUnits.h> - -#include <corsika/utl/CorsikaFenv.h> -#include <catch2/catch.hpp> - -TEST_CASE("CONEX", "[processes]") { - - SECTION("linking conex") { - using std::cout; - using std::endl; - - /* - std::string parameterPathName = ""; - // auto cxModel = eSibyll23; - // ConexDynamicInterface cx(cxModel); - - int randomSeeds[3]; - randomSeeds[0] = 1234; - randomSeeds[1] = 0; - randomSeeds[2] = 0; - - int nShower = 1; // large to avoid final stats. - int maxDetail = 0; - int particleListMode = 0; - // cx.Init(nShower, randomSeeds, maxDetail, particleListMode, parameterPathName); - - double energyInGeV = 100.; - double zenith = 60; - double azimuth = 0; - double impactParameter = 0; - int particleType = 100; - - // cx.RunConex(randomSeeds, energyInGeV, zenith, azimuth, impactParameter, - // particleType); - */ - } -} -- GitLab