diff --git a/Processes/CONEXSourceCut/CONEX.h b/Processes/CONEXSourceCut/CONEX.h deleted file mode 100644 index a9dc2585dfbcf41a5c55941412f226d4a050ccc3..0000000000000000000000000000000000000000 --- a/Processes/CONEXSourceCut/CONEX.h +++ /dev/null @@ -1,20 +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 <array> - -extern "C" { -int InitialParticle_(int const&); - -struct cxoptl_ { - std::array<double, 16> dptl; -}; -} diff --git a/Processes/CONEXSourceCut/CONEX_f.h b/Processes/CONEXSourceCut/CONEX_f.h index 0271b9f63df991b058dad4da7cd7a98cba690941..a3076f5b63882d0cc992ab025cd1332c2bde24b5 100644 --- a/Processes/CONEXSourceCut/CONEX_f.h +++ b/Processes/CONEXSourceCut/CONEX_f.h @@ -17,11 +17,14 @@ #include <conexConfig.h> #include <conexHEModels.h> +#include <array> namespace conex { - extern "C" { - // ipart,energy,theta,phi,dimpact,ioseed + extern struct { std::array<double, 16> dptl; } cxoptl_; + + void cegs4_(int&, int&); + void initconex_(int&, int*, int&, int&, #ifdef CONEX_EXTENSIONS int&,