From db56ac7aa5e282c3f3c947bff3b4f73062db42b5 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de> Date: Fri, 5 Aug 2016 22:39:02 +0200 Subject: [PATCH] rm direct python include (CorePython.py) from libBornAgainCore.i: we use the CMake/plot_utils machinery instead. --- Wrap/python/plot_utils.py | 13 ++++++++++++- Wrap/swig/CorePython.py | 20 -------------------- Wrap/swig/libBornAgainCore.i | 2 -- 3 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 Wrap/swig/CorePython.py diff --git a/Wrap/python/plot_utils.py b/Wrap/python/plot_utils.py index 1a7ed18d08b..c554fbe7e00 100644 --- a/Wrap/python/plot_utils.py +++ b/Wrap/python/plot_utils.py @@ -1,6 +1,17 @@ +# ************************************************************************** # ''' -BornAgain plot utils +# BornAgain: simulate and fit scattering at grazing incidence +# +# @file Wrap/python.plot_utils +# @brief Python extensions of the SWIG-generated Python module bornagain. +# +# @homepage http://apps.jcns.fz-juelich.de/BornAgain +# @license GNU General Public License v3 or higher (see COPYING) +# @copyright Forschungszentrum Juelich GmbH 2016 +# @authors Scientific Computing Group at MLZ Garching +# @authors J. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke ''' +# ************************************************************************** # from __future__ import print_function from bornagain import deg as deg diff --git a/Wrap/swig/CorePython.py b/Wrap/swig/CorePython.py deleted file mode 100644 index e7457fb136c..00000000000 --- a/Wrap/swig/CorePython.py +++ /dev/null @@ -1,20 +0,0 @@ -%pythoncode %{ - -# ************************************************************************** # -# -# BornAgain: simulate and fit scattering at grazing incidence -# -# @file Wrap/swig/CorePython.py -# @brief Python extensions of the SWIG-genrated Python module bornagain. -# This file is included by libBornAgainCore.i. -# -# @homepage http://apps.jcns.fz-juelich.de/BornAgain -# @license GNU General Public License v3 or higher (see COPYING) -# @copyright Forschungszentrum Juelich GmbH 2016 -# @authors Scientific Computing Group at MLZ Garching -# @authors J. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke -# -# ************************************************************************** # - - -%} diff --git a/Wrap/swig/libBornAgainCore.i b/Wrap/swig/libBornAgainCore.i index 0e73c954b28..5d19d85dd3e 100644 --- a/Wrap/swig/libBornAgainCore.i +++ b/Wrap/swig/libBornAgainCore.i @@ -416,5 +416,3 @@ //%include "SimulationFactory.h" %include "extendCore.i" - -%include "CorePython.py" -- GitLab