From 70c2e4a902aeef2f79e7073e6525a9e38ede8bc2 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 8 Aug 2020 20:52:42 +0200
Subject: [PATCH] repair RoughnessModel py test
---
Wrap/swig/libBornAgainCore.i | 3 ++-
auto/Wrap/libBornAgainCore.py | 14 +++++++-------
auto/Wrap/libBornAgainCore_wrap.cpp | 16 ++++++++--------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Wrap/swig/libBornAgainCore.i b/Wrap/swig/libBornAgainCore.i
index cf645760101..53d3f6e9eb7 100644
--- a/Wrap/swig/libBornAgainCore.i
+++ b/Wrap/swig/libBornAgainCore.i
@@ -400,9 +400,10 @@
%include "Core/Multilayer/Layer.h"
%include "Core/Multilayer/LayerRoughness.h"
%include "Core/Multilayer/MultiLayer.h"
-%include "Core/Multilayer/RoughnessModels.h"
+
// SWIG workaround for using axes units the same way as they are used in cpp files
%rename(RoughnessModel) RoughnessModelWrap;
+%include "Core/Multilayer/RoughnessModels.h"
%include "Core/HardParticle/FormFactorPolyhedron.h"
%include "Core/HardParticle/FormFactorPolyhedron.h"
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 1b1b5039867..79ddf49c10d 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -14576,7 +14576,7 @@ class MultiLayer(ISample):
# Register MultiLayer in _libBornAgainCore:
_libBornAgainCore.MultiLayer_swigregister(MultiLayer)
-class RoughnessModelWrap(object):
+class RoughnessModel(object):
r"""Proxy of C++ RoughnessModelWrap class."""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
@@ -14584,16 +14584,16 @@ class RoughnessModelWrap(object):
def __init__(self, *args, **kwargs):
raise AttributeError("No constructor defined")
__repr__ = _swig_repr
- DEFAULT = _libBornAgainCore.RoughnessModelWrap_DEFAULT
+ DEFAULT = _libBornAgainCore.RoughnessModel_DEFAULT
- TANH = _libBornAgainCore.RoughnessModelWrap_TANH
+ TANH = _libBornAgainCore.RoughnessModel_TANH
- NEVOT_CROCE = _libBornAgainCore.RoughnessModelWrap_NEVOT_CROCE
+ NEVOT_CROCE = _libBornAgainCore.RoughnessModel_NEVOT_CROCE
- __swig_destroy__ = _libBornAgainCore.delete_RoughnessModelWrap
+ __swig_destroy__ = _libBornAgainCore.delete_RoughnessModel
-# Register RoughnessModelWrap in _libBornAgainCore:
-_libBornAgainCore.RoughnessModelWrap_swigregister(RoughnessModelWrap)
+# Register RoughnessModel in _libBornAgainCore:
+_libBornAgainCore.RoughnessModel_swigregister(RoughnessModel)
class PolygonalTopology(object):
r"""
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 532f3e22121..6238a2be6df 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -90364,7 +90364,7 @@ SWIGINTERN PyObject *MultiLayer_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_delete_RoughnessModelWrap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_RoughnessModel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
RoughnessModelWrap *arg1 = (RoughnessModelWrap *) 0 ;
void *argp1 = 0 ;
@@ -90375,7 +90375,7 @@ SWIGINTERN PyObject *_wrap_delete_RoughnessModelWrap(PyObject *SWIGUNUSEDPARM(se
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RoughnessModelWrap, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RoughnessModelWrap" "', argument " "1"" of type '" "RoughnessModelWrap *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RoughnessModel" "', argument " "1"" of type '" "RoughnessModelWrap *""'");
}
arg1 = reinterpret_cast< RoughnessModelWrap * >(argp1);
delete arg1;
@@ -90386,7 +90386,7 @@ fail:
}
-SWIGINTERN PyObject *RoughnessModelWrap_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RoughnessModel_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
SWIG_TypeNewClientData(SWIGTYPE_p_RoughnessModelWrap, SWIG_NewClientData(obj));
@@ -130036,8 +130036,8 @@ static PyMethodDef SwigMethods[] = {
""},
{ "MultiLayer_swigregister", MultiLayer_swigregister, METH_O, NULL},
{ "MultiLayer_swiginit", MultiLayer_swiginit, METH_VARARGS, NULL},
- { "delete_RoughnessModelWrap", _wrap_delete_RoughnessModelWrap, METH_O, "delete_RoughnessModelWrap(RoughnessModelWrap self)"},
- { "RoughnessModelWrap_swigregister", RoughnessModelWrap_swigregister, METH_O, NULL},
+ { "delete_RoughnessModel", _wrap_delete_RoughnessModel, METH_O, "delete_RoughnessModel(RoughnessModel self)"},
+ { "RoughnessModel_swigregister", RoughnessModel_swigregister, METH_O, NULL},
{ "PolygonalTopology_vertexIndices_set", _wrap_PolygonalTopology_vertexIndices_set, METH_VARARGS, "PolygonalTopology_vertexIndices_set(PolygonalTopology self, vector_integer_t vertexIndices)"},
{ "PolygonalTopology_vertexIndices_get", _wrap_PolygonalTopology_vertexIndices_get, METH_O, "PolygonalTopology_vertexIndices_get(PolygonalTopology self) -> vector_integer_t"},
{ "PolygonalTopology_symmetry_S2_set", _wrap_PolygonalTopology_symmetry_S2_set, METH_VARARGS, "PolygonalTopology_symmetry_S2_set(PolygonalTopology self, bool symmetry_S2)"},
@@ -139664,9 +139664,9 @@ SWIG_init(void) {
SWIG_addvarlink(globals, "deg", Swig_var_deg_get, Swig_var_deg_set);
SWIG_addvarlink(globals, "tesla", Swig_var_tesla_get, Swig_var_tesla_set);
SWIG_addvarlink(globals, "gauss", Swig_var_gauss_get, Swig_var_gauss_set);
- SWIG_Python_SetConstant(d, "RoughnessModelWrap_DEFAULT",SWIG_From_int(static_cast< int >(RoughnessModelWrap::DEFAULT)));
- SWIG_Python_SetConstant(d, "RoughnessModelWrap_TANH",SWIG_From_int(static_cast< int >(RoughnessModelWrap::TANH)));
- SWIG_Python_SetConstant(d, "RoughnessModelWrap_NEVOT_CROCE",SWIG_From_int(static_cast< int >(RoughnessModelWrap::NEVOT_CROCE)));
+ SWIG_Python_SetConstant(d, "RoughnessModel_DEFAULT",SWIG_From_int(static_cast< int >(RoughnessModelWrap::DEFAULT)));
+ SWIG_Python_SetConstant(d, "RoughnessModel_TANH",SWIG_From_int(static_cast< int >(RoughnessModelWrap::TANH)));
+ SWIG_Python_SetConstant(d, "RoughnessModel_NEVOT_CROCE",SWIG_From_int(static_cast< int >(RoughnessModelWrap::NEVOT_CROCE)));
SWIG_Python_SetConstant(d, "RectangularDetector_GENERIC",SWIG_From_int(static_cast< int >(RectangularDetector::GENERIC)));
SWIG_Python_SetConstant(d, "RectangularDetector_PERPENDICULAR_TO_SAMPLE",SWIG_From_int(static_cast< int >(RectangularDetector::PERPENDICULAR_TO_SAMPLE)));
SWIG_Python_SetConstant(d, "RectangularDetector_PERPENDICULAR_TO_DIRECT_BEAM",SWIG_From_int(static_cast< int >(RectangularDetector::PERPENDICULAR_TO_DIRECT_BEAM)));
--
GitLab