From 7ddbde08e323e7cf28c14ef383be110b538caf1d Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Wed, 23 Sep 2020 14:16:58 +0200 Subject: [PATCH] regenerate bindings --- auto/Wrap/libBornAgainCore.py | 40 +++++--------- auto/Wrap/libBornAgainCore_wrap.cpp | 82 ++++++++++++----------------- 2 files changed, 45 insertions(+), 77 deletions(-) diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py index 522e633f720..537cbe73e2e 100644 --- a/auto/Wrap/libBornAgainCore.py +++ b/auto/Wrap/libBornAgainCore.py @@ -8166,13 +8166,9 @@ class IFormFactor(ISample): _libBornAgainCore.IFormFactor_swigregister(IFormFactor) -def CreateTransformedFormFactor(formfactor, rot, translation): - r""" - CreateTransformedFormFactor(IFormFactor formfactor, IRotation rot, kvector_t translation) -> IFormFactor - IFormFactor* CreateTransformedFormFactor(const IFormFactor &formfactor, const IRotation &rot, kvector_t translation) - - """ - return _libBornAgainCore.CreateTransformedFormFactor(formfactor, rot, translation) +def createTransformedFormFactor(formfactor, rot, translation): + r"""createTransformedFormFactor(IFormFactor formfactor, IRotation rot, kvector_t translation) -> IFormFactor""" + return _libBornAgainCore.createTransformedFormFactor(formfactor, rot, translation) class IFormFactorBorn(IFormFactor): r""" @@ -21858,29 +21854,17 @@ class HexagonalLattice(Lattice2D): _libBornAgainCore.HexagonalLattice_swigregister(HexagonalLattice) -def CreateFCCLattice(lattice_constant, orientation): - r""" - CreateFCCLattice(double lattice_constant, ILatticeOrientation orientation) -> Lattice - Lattice LatticeUtils::CreateFCCLattice(double lattice_constant, const ILatticeOrientation &orientation) - - """ - return _libBornAgainCore.CreateFCCLattice(lattice_constant, orientation) - -def CreateHCPLattice(a, c, orientation): - r""" - CreateHCPLattice(double a, double c, ILatticeOrientation orientation) -> Lattice - Lattice LatticeUtils::CreateHCPLattice(double a, double c, const ILatticeOrientation &orientation) - - """ - return _libBornAgainCore.CreateHCPLattice(a, c, orientation) +def createFCCLattice(lattice_constant, orientation): + r"""createFCCLattice(double lattice_constant, ILatticeOrientation orientation) -> Lattice""" + return _libBornAgainCore.createFCCLattice(lattice_constant, orientation) -def CreateBCTLattice(a, c, orientation): - r""" - CreateBCTLattice(double a, double c, ILatticeOrientation orientation) -> Lattice - Lattice LatticeUtils::CreateBCTLattice(double a, double c, const ILatticeOrientation &orientation) +def createHCPLattice(a, c, orientation): + r"""createHCPLattice(double a, double c, ILatticeOrientation orientation) -> Lattice""" + return _libBornAgainCore.createHCPLattice(a, c, orientation) - """ - return _libBornAgainCore.CreateBCTLattice(a, c, orientation) +def createBCTLattice(a, c, orientation): + r"""createBCTLattice(double a, double c, ILatticeOrientation orientation) -> Lattice""" + return _libBornAgainCore.createBCTLattice(a, c, orientation) class Material(object): r""" diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp index 0f7a3fd4501..3c24727a700 100644 --- a/auto/Wrap/libBornAgainCore_wrap.cpp +++ b/auto/Wrap/libBornAgainCore_wrap.cpp @@ -68999,7 +68999,7 @@ SWIGINTERN PyObject *IFormFactor_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObje return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_CreateTransformedFormFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_createTransformedFormFactor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; IFormFactor *arg1 = 0 ; IRotation *arg2 = 0 ; @@ -69013,37 +69013,37 @@ SWIGINTERN PyObject *_wrap_CreateTransformedFormFactor(PyObject *SWIGUNUSEDPARM( PyObject *swig_obj[3] ; IFormFactor *result = 0 ; - if (!SWIG_Python_UnpackTuple(args, "CreateTransformedFormFactor", 3, 3, swig_obj)) SWIG_fail; + if (!SWIG_Python_UnpackTuple(args, "createTransformedFormFactor", 3, 3, swig_obj)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_IFormFactor, 0 | 0); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CreateTransformedFormFactor" "', argument " "1"" of type '" "IFormFactor const &""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "createTransformedFormFactor" "', argument " "1"" of type '" "IFormFactor const &""'"); } if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CreateTransformedFormFactor" "', argument " "1"" of type '" "IFormFactor const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "createTransformedFormFactor" "', argument " "1"" of type '" "IFormFactor const &""'"); } arg1 = reinterpret_cast< IFormFactor * >(argp1); res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRotation, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CreateTransformedFormFactor" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "createTransformedFormFactor" "', argument " "2"" of type '" "IRotation const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CreateTransformedFormFactor" "', argument " "2"" of type '" "IRotation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "createTransformedFormFactor" "', argument " "2"" of type '" "IRotation const &""'"); } arg2 = reinterpret_cast< IRotation * >(argp2); { res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_BasicVector3DT_double_t, 0 | 0); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CreateTransformedFormFactor" "', argument " "3"" of type '" "kvector_t""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "createTransformedFormFactor" "', argument " "3"" of type '" "kvector_t""'"); } if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CreateTransformedFormFactor" "', argument " "3"" of type '" "kvector_t""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "createTransformedFormFactor" "', argument " "3"" of type '" "kvector_t""'"); } else { kvector_t * temp = reinterpret_cast< kvector_t * >(argp3); arg3 = *temp; if (SWIG_IsNewObj(res3)) delete temp; } } - result = (IFormFactor *)CreateTransformedFormFactor((IFormFactor const &)*arg1,(IRotation const &)*arg2,arg3); + result = (IFormFactor *)createTransformedFormFactor((IFormFactor const &)*arg1,(IRotation const &)*arg2,arg3); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IFormFactor, 0 | 0 ); return resultobj; fail: @@ -119729,7 +119729,7 @@ SWIGINTERN PyObject *HexagonalLattice_swiginit(PyObject *SWIGUNUSEDPARM(self), P return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_CreateFCCLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_createFCCLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; double arg1 ; ILatticeOrientation *arg2 = 0 ; @@ -119740,21 +119740,21 @@ SWIGINTERN PyObject *_wrap_CreateFCCLattice(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject *swig_obj[2] ; SwigValueWrapper< Lattice > result; - if (!SWIG_Python_UnpackTuple(args, "CreateFCCLattice", 2, 2, swig_obj)) SWIG_fail; + if (!SWIG_Python_UnpackTuple(args, "createFCCLattice", 2, 2, swig_obj)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { - SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "CreateFCCLattice" "', argument " "1"" of type '" "double""'"); + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "createFCCLattice" "', argument " "1"" of type '" "double""'"); } arg1 = static_cast< double >(val1); res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_ILatticeOrientation, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CreateFCCLattice" "', argument " "2"" of type '" "ILatticeOrientation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "createFCCLattice" "', argument " "2"" of type '" "ILatticeOrientation const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CreateFCCLattice" "', argument " "2"" of type '" "ILatticeOrientation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "createFCCLattice" "', argument " "2"" of type '" "ILatticeOrientation const &""'"); } arg2 = reinterpret_cast< ILatticeOrientation * >(argp2); - result = LatticeUtils::CreateFCCLattice(arg1,(ILatticeOrientation const &)*arg2); + result = LatticeUtils::createFCCLattice(arg1,(ILatticeOrientation const &)*arg2); resultobj = SWIG_NewPointerObj((new Lattice(static_cast< const Lattice& >(result))), SWIGTYPE_p_Lattice, SWIG_POINTER_OWN | 0 ); return resultobj; fail: @@ -119762,7 +119762,7 @@ fail: } -SWIGINTERN PyObject *_wrap_CreateHCPLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_createHCPLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; double arg1 ; double arg2 ; @@ -119776,26 +119776,26 @@ SWIGINTERN PyObject *_wrap_CreateHCPLattice(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject *swig_obj[3] ; SwigValueWrapper< Lattice > result; - if (!SWIG_Python_UnpackTuple(args, "CreateHCPLattice", 3, 3, swig_obj)) SWIG_fail; + if (!SWIG_Python_UnpackTuple(args, "createHCPLattice", 3, 3, swig_obj)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { - SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "CreateHCPLattice" "', argument " "1"" of type '" "double""'"); + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "createHCPLattice" "', argument " "1"" of type '" "double""'"); } arg1 = static_cast< double >(val1); ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CreateHCPLattice" "', argument " "2"" of type '" "double""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "createHCPLattice" "', argument " "2"" of type '" "double""'"); } arg2 = static_cast< double >(val2); res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_ILatticeOrientation, 0 | 0); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CreateHCPLattice" "', argument " "3"" of type '" "ILatticeOrientation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "createHCPLattice" "', argument " "3"" of type '" "ILatticeOrientation const &""'"); } if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CreateHCPLattice" "', argument " "3"" of type '" "ILatticeOrientation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "createHCPLattice" "', argument " "3"" of type '" "ILatticeOrientation const &""'"); } arg3 = reinterpret_cast< ILatticeOrientation * >(argp3); - result = LatticeUtils::CreateHCPLattice(arg1,arg2,(ILatticeOrientation const &)*arg3); + result = LatticeUtils::createHCPLattice(arg1,arg2,(ILatticeOrientation const &)*arg3); resultobj = SWIG_NewPointerObj((new Lattice(static_cast< const Lattice& >(result))), SWIGTYPE_p_Lattice, SWIG_POINTER_OWN | 0 ); return resultobj; fail: @@ -119803,7 +119803,7 @@ fail: } -SWIGINTERN PyObject *_wrap_CreateBCTLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_createBCTLattice(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; double arg1 ; double arg2 ; @@ -119817,26 +119817,26 @@ SWIGINTERN PyObject *_wrap_CreateBCTLattice(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject *swig_obj[3] ; SwigValueWrapper< Lattice > result; - if (!SWIG_Python_UnpackTuple(args, "CreateBCTLattice", 3, 3, swig_obj)) SWIG_fail; + if (!SWIG_Python_UnpackTuple(args, "createBCTLattice", 3, 3, swig_obj)) SWIG_fail; ecode1 = SWIG_AsVal_double(swig_obj[0], &val1); if (!SWIG_IsOK(ecode1)) { - SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "CreateBCTLattice" "', argument " "1"" of type '" "double""'"); + SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "createBCTLattice" "', argument " "1"" of type '" "double""'"); } arg1 = static_cast< double >(val1); ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CreateBCTLattice" "', argument " "2"" of type '" "double""'"); + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "createBCTLattice" "', argument " "2"" of type '" "double""'"); } arg2 = static_cast< double >(val2); res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_ILatticeOrientation, 0 | 0); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CreateBCTLattice" "', argument " "3"" of type '" "ILatticeOrientation const &""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "createBCTLattice" "', argument " "3"" of type '" "ILatticeOrientation const &""'"); } if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CreateBCTLattice" "', argument " "3"" of type '" "ILatticeOrientation const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "createBCTLattice" "', argument " "3"" of type '" "ILatticeOrientation const &""'"); } arg3 = reinterpret_cast< ILatticeOrientation * >(argp3); - result = LatticeUtils::CreateBCTLattice(arg1,arg2,(ILatticeOrientation const &)*arg3); + result = LatticeUtils::createBCTLattice(arg1,arg2,(ILatticeOrientation const &)*arg3); resultobj = SWIG_NewPointerObj((new Lattice(static_cast< const Lattice& >(result))), SWIGTYPE_p_Lattice, SWIG_POINTER_OWN | 0 ); return resultobj; fail: @@ -125127,11 +125127,7 @@ static PyMethodDef SwigMethods[] = { { "disown_IFormFactor", _wrap_disown_IFormFactor, METH_O, NULL}, { "IFormFactor_swigregister", IFormFactor_swigregister, METH_O, NULL}, { "IFormFactor_swiginit", IFormFactor_swiginit, METH_VARARGS, NULL}, - { "CreateTransformedFormFactor", _wrap_CreateTransformedFormFactor, METH_VARARGS, "\n" - "CreateTransformedFormFactor(IFormFactor formfactor, IRotation rot, kvector_t translation) -> IFormFactor\n" - "IFormFactor* CreateTransformedFormFactor(const IFormFactor &formfactor, const IRotation &rot, kvector_t translation)\n" - "\n" - ""}, + { "createTransformedFormFactor", _wrap_createTransformedFormFactor, METH_VARARGS, "createTransformedFormFactor(IFormFactor formfactor, IRotation rot, kvector_t translation) -> IFormFactor"}, { "new_IFormFactorBorn", _wrap_new_IFormFactorBorn, METH_VARARGS, "\n" "IFormFactorBorn()\n" "new_IFormFactorBorn(PyObject * _self, NodeMeta meta, vdouble1d_t PValues) -> IFormFactorBorn\n" @@ -133074,21 +133070,9 @@ static PyMethodDef SwigMethods[] = { { "delete_HexagonalLattice", _wrap_delete_HexagonalLattice, METH_O, "delete_HexagonalLattice(HexagonalLattice self)"}, { "HexagonalLattice_swigregister", HexagonalLattice_swigregister, METH_O, NULL}, { "HexagonalLattice_swiginit", HexagonalLattice_swiginit, METH_VARARGS, NULL}, - { "CreateFCCLattice", _wrap_CreateFCCLattice, METH_VARARGS, "\n" - "CreateFCCLattice(double lattice_constant, ILatticeOrientation orientation) -> Lattice\n" - "Lattice LatticeUtils::CreateFCCLattice(double lattice_constant, const ILatticeOrientation &orientation)\n" - "\n" - ""}, - { "CreateHCPLattice", _wrap_CreateHCPLattice, METH_VARARGS, "\n" - "CreateHCPLattice(double a, double c, ILatticeOrientation orientation) -> Lattice\n" - "Lattice LatticeUtils::CreateHCPLattice(double a, double c, const ILatticeOrientation &orientation)\n" - "\n" - ""}, - { "CreateBCTLattice", _wrap_CreateBCTLattice, METH_VARARGS, "\n" - "CreateBCTLattice(double a, double c, ILatticeOrientation orientation) -> Lattice\n" - "Lattice LatticeUtils::CreateBCTLattice(double a, double c, const ILatticeOrientation &orientation)\n" - "\n" - ""}, + { "createFCCLattice", _wrap_createFCCLattice, METH_VARARGS, "createFCCLattice(double lattice_constant, ILatticeOrientation orientation) -> Lattice"}, + { "createHCPLattice", _wrap_createHCPLattice, METH_VARARGS, "createHCPLattice(double a, double c, ILatticeOrientation orientation) -> Lattice"}, + { "createBCTLattice", _wrap_createBCTLattice, METH_VARARGS, "createBCTLattice(double a, double c, ILatticeOrientation orientation) -> Lattice"}, { "new_Material", _wrap_new_Material, METH_VARARGS, "\n" "Material(Material material)\n" "new_Material(Material material) -> Material\n" -- GitLab