From 0cf0f66cf08fe29172bda6acc3dcbeb43b31878b Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@kit.edu>
Date: Fri, 10 Jul 2020 17:53:57 +0200
Subject: [PATCH] back to cegs4()
---
Processes/CONEXSourceCut/CONEX.h | 20 --------------------
Processes/CONEXSourceCut/CONEX_f.h | 7 +++++--
2 files changed, 5 insertions(+), 22 deletions(-)
delete mode 100644 Processes/CONEXSourceCut/CONEX.h
diff --git a/Processes/CONEXSourceCut/CONEX.h b/Processes/CONEXSourceCut/CONEX.h
deleted file mode 100644
index a9dc2585d..000000000
--- 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 0271b9f63..a3076f5b6 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&,
--
GitLab