From fdadf40685495e3d4db613bf3f674884e99474c9 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 30 Nov 2021 09:36:10 +0100
Subject: [PATCH] use headers from heinz
---
GUI/Model/Session/SessionXML.h | 4 +-
auto/Wrap/libBornAgainSample.py | 4 +-
auto/Wrap/libBornAgainSample_wrap.cpp | 90 +++++++++++++--------------
3 files changed, 46 insertions(+), 52 deletions(-)
diff --git a/GUI/Model/Session/SessionXML.h b/GUI/Model/Session/SessionXML.h
index 05f4f22250c..4cd11e26b27 100644
--- a/GUI/Model/Session/SessionXML.h
+++ b/GUI/Model/Session/SessionXML.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_SESSION_SESSIONXML_H
#define BORNAGAIN_GUI_MODEL_SESSION_SESSIONXML_H
-#include "Base/Types/Complex.h"
-#include "Base/Vector/Vectors3D.h"
+#include <heinz/Complex.h>
+#include <heinz/Vectors3D.h>
#include <QVariant>
class QXmlStreamWriter;
diff --git a/auto/Wrap/libBornAgainSample.py b/auto/Wrap/libBornAgainSample.py
index c6678e06e24..76606e7bd9b 100644
--- a/auto/Wrap/libBornAgainSample.py
+++ b/auto/Wrap/libBornAgainSample.py
@@ -1911,8 +1911,8 @@ class R3(object):
def __init__(self, *args):
r"""
+ __init__(R3 self, double const x_, double const y_, double const z_) -> R3
__init__(R3 self) -> R3
- __init__(R3 self, double const x, double const y, double const z) -> R3
"""
_libBornAgainSample.R3_swiginit(self, _libBornAgainSample.new_R3(*args))
@@ -2207,8 +2207,8 @@ class C3(object):
def __init__(self, *args):
r"""
+ __init__(C3 self, std::complex< double > const x_, std::complex< double > const y_, std::complex< double > const z_) -> C3
__init__(C3 self) -> C3
- __init__(C3 self, std::complex< double > const x, std::complex< double > const y, std::complex< double > const z) -> C3
"""
_libBornAgainSample.C3_swiginit(self, _libBornAgainSample.new_C3(*args))
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index ae4e9b6fbd3..2bd91babaa9 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -28116,20 +28116,7 @@ SWIGINTERN PyObject *vector_pvacuum_double_t_swiginit(PyObject *SWIGUNUSEDPARM(s
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_R3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
- PyObject *resultobj = 0;
- Vec3< double > *result = 0 ;
-
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
- result = (Vec3< double > *)new Vec3< double >();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Vec3T_double_t, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_R3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_R3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
double arg1 ;
double arg2 ;
@@ -28166,6 +28153,19 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_R3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+ PyObject *resultobj = 0;
+ Vec3< double > *result = 0 ;
+
+ if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ result = (Vec3< double > *)new Vec3< double >();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Vec3T_double_t, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_new_R3(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[4] = {
@@ -28175,7 +28175,7 @@ SWIGINTERN PyObject *_wrap_new_R3(PyObject *self, PyObject *args) {
if (!(argc = SWIG_Python_UnpackTuple(args, "new_R3", 0, 3, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_R3__SWIG_0(self, argc, argv);
+ return _wrap_new_R3__SWIG_1(self, argc, argv);
}
if (argc == 3) {
int _v;
@@ -28194,7 +28194,7 @@ SWIGINTERN PyObject *_wrap_new_R3(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_new_R3__SWIG_1(self, argc, argv);
+ return _wrap_new_R3__SWIG_0(self, argc, argv);
}
}
}
@@ -28203,8 +28203,8 @@ SWIGINTERN PyObject *_wrap_new_R3(PyObject *self, PyObject *args) {
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_R3'.\n"
" Possible C/C++ prototypes are:\n"
- " Vec3< double >::Vec3()\n"
- " Vec3< double >::Vec3(double const,double const,double const)\n");
+ " Vec3< double >::Vec3(double const,double const,double const)\n"
+ " Vec3< double >::Vec3()\n");
return 0;
}
@@ -30828,20 +30828,7 @@ SWIGINTERN PyObject *vector_R3_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_C3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
- PyObject *resultobj = 0;
- Vec3< std::complex< double > > *result = 0 ;
-
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
- result = (Vec3< std::complex< double > > *)new Vec3< std::complex< double > >();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Vec3T_std__complexT_double_t_t, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_C3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_new_C3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
std::complex< double > arg1 ;
std::complex< double > arg2 ;
@@ -30878,6 +30865,19 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_C3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+ PyObject *resultobj = 0;
+ Vec3< std::complex< double > > *result = 0 ;
+
+ if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ result = (Vec3< std::complex< double > > *)new Vec3< std::complex< double > >();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Vec3T_std__complexT_double_t_t, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_new_C3(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[4] = {
@@ -30887,7 +30887,7 @@ SWIGINTERN PyObject *_wrap_new_C3(PyObject *self, PyObject *args) {
if (!(argc = SWIG_Python_UnpackTuple(args, "new_C3", 0, 3, argv))) SWIG_fail;
--argc;
if (argc == 0) {
- return _wrap_new_C3__SWIG_0(self, argc, argv);
+ return _wrap_new_C3__SWIG_1(self, argc, argv);
}
if (argc == 3) {
int _v;
@@ -30906,7 +30906,7 @@ SWIGINTERN PyObject *_wrap_new_C3(PyObject *self, PyObject *args) {
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_new_C3__SWIG_1(self, argc, argv);
+ return _wrap_new_C3__SWIG_0(self, argc, argv);
}
}
}
@@ -30915,8 +30915,8 @@ SWIGINTERN PyObject *_wrap_new_C3(PyObject *self, PyObject *args) {
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_C3'.\n"
" Possible C/C++ prototypes are:\n"
- " Vec3< std::complex< double > >::Vec3()\n"
- " Vec3< std::complex< double > >::Vec3(std::complex< double > const,std::complex< double > const,std::complex< double > const)\n");
+ " Vec3< std::complex< double > >::Vec3(std::complex< double > const,std::complex< double > const,std::complex< double > const)\n"
+ " Vec3< std::complex< double > >::Vec3()\n");
return 0;
}
@@ -71572,8 +71572,8 @@ static PyMethodDef SwigMethods[] = {
{ "vector_pvacuum_double_t_swigregister", vector_pvacuum_double_t_swigregister, METH_O, NULL},
{ "vector_pvacuum_double_t_swiginit", vector_pvacuum_double_t_swiginit, METH_VARARGS, NULL},
{ "new_R3", _wrap_new_R3, METH_VARARGS, "\n"
- "R3()\n"
- "new_R3(double const x, double const y, double const z) -> R3\n"
+ "R3(double const x_, double const y_, double const z_)\n"
+ "new_R3() -> R3\n"
""},
{ "R3_x", _wrap_R3_x, METH_O, "R3_x(R3 self) -> double"},
{ "R3_y", _wrap_R3_y, METH_O, "R3_y(R3 self) -> double"},
@@ -71669,8 +71669,8 @@ static PyMethodDef SwigMethods[] = {
{ "vector_R3_swigregister", vector_R3_swigregister, METH_O, NULL},
{ "vector_R3_swiginit", vector_R3_swiginit, METH_VARARGS, NULL},
{ "new_C3", _wrap_new_C3, METH_VARARGS, "\n"
- "C3()\n"
- "new_C3(std::complex< double > const x, std::complex< double > const y, std::complex< double > const z) -> C3\n"
+ "C3(std::complex< double > const x_, std::complex< double > const y_, std::complex< double > const z_)\n"
+ "new_C3() -> C3\n"
""},
{ "C3_x", _wrap_C3_x, METH_O, "C3_x(C3 self) -> std::complex< double >"},
{ "C3_y", _wrap_C3_y, METH_O, "C3_y(C3 self) -> std::complex< double >"},
@@ -78031,9 +78031,6 @@ static void *_p_FTDistribution1DTriangleTo_p_ICloneable(void *x, int *SWIGUNUSED
static void *_p_RotationEulerTo_p_ICloneable(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICloneable *) (IRotation *) ((RotationEuler *) x));
}
-static void *_p_Vec3T_double_tTo_p_std__arrayT_double_3_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((std::array< double,3 > *) ((Vec3< double > *) x));
-}
static void *_p_FormFactorCosineRippleLorentzTo_p_ICosineRipple(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ICosineRipple *) ((FormFactorCosineRippleLorentz *) x));
}
@@ -78508,9 +78505,6 @@ static void *_p_FormFactorAnisoPyramidTo_p_IBornFF(void *x, int *SWIGUNUSEDPARM(
static void *_p_FormFactorPrism3To_p_IBornFF(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IBornFF *) (IFormFactorPrism *) ((FormFactorPrism3 *) x));
}
-static void *_p_Vec3T_std__complexT_double_t_tTo_p_std__arrayT_std__complexT_double_t_3_t(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((std::array< std::complex< double >,3 > *) ((Vec3< std::complex< double > > *) x));
-}
static void *_p_FTDecayFunction1DCauchyTo_p_IFTDecayFunction1D(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((IFTDecayFunction1D *) ((FTDecayFunction1DCauchy *) x));
}
@@ -79090,8 +79084,8 @@ static swig_cast_info _swigc__p_std__allocatorT_std__string_t[] = { {&_swigt__p
static swig_cast_info _swigc__p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t[] = { {&_swigt__p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t[] = { {&_swigt__p_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_std__allocatorT_unsigned_long_t[] = { {&_swigt__p_std__allocatorT_unsigned_long_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__arrayT_double_3_t[] = { {&_swigt__p_Vec3T_double_t, _p_Vec3T_double_tTo_p_std__arrayT_double_3_t, 0, 0}, {&_swigt__p_std__arrayT_double_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__arrayT_std__complexT_double_t_3_t[] = { {&_swigt__p_std__arrayT_std__complexT_double_t_3_t, 0, 0, 0}, {&_swigt__p_Vec3T_std__complexT_double_t_t, _p_Vec3T_std__complexT_double_t_tTo_p_std__arrayT_std__complexT_double_t_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__arrayT_double_3_t[] = { {&_swigt__p_std__arrayT_double_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__arrayT_std__complexT_double_t_3_t[] = { {&_swigt__p_std__arrayT_std__complexT_double_t_3_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_std__complexT_double_t[] = { {&_swigt__p_std__complexT_double_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_std__invalid_argument[] = { {&_swigt__p_std__invalid_argument, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_std__lessT_std__string_t[] = { {&_swigt__p_std__lessT_std__string_t, 0, 0, 0},{0, 0, 0, 0}};
--
GitLab