From 878bca02c7dd9b894243f4ba2b6a7b4155a1c1f0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 8 Aug 2020 23:01:18 +0200
Subject: [PATCH] corr lib*Core.i, and regenerate
---
Wrap/swig/libBornAgainCore.i | 4 +-
auto/Wrap/libBornAgainCore.py | 68 +--
auto/Wrap/libBornAgainCore_wrap.cpp | 624 ++++++++++++++--------------
3 files changed, 348 insertions(+), 348 deletions(-)
diff --git a/Wrap/swig/libBornAgainCore.i b/Wrap/swig/libBornAgainCore.i
index 53d3f6e9eb7..47c31a2eecc 100644
--- a/Wrap/swig/libBornAgainCore.i
+++ b/Wrap/swig/libBornAgainCore.i
@@ -196,7 +196,7 @@
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Parametrization/ThreadInfo.h"
-#include "Core/Parametrization/Units.h"
+#include "Core/Basics/Units.h"
#include "Core/Particle/Crystal.h"
#include "Core/Particle/FormFactorCrystal.h"
#include "Core/Particle/FormFactorWeighted.h"
@@ -319,6 +319,7 @@
%include "Core/Basics/ICloneable.h"
%include "Core/Basics/ISingleton.h"
%include "Core/Basics/Complex.h"
+%include "Core/Basics/Units.h"
%include "Core/Vector/Vectors3D.h"
%include "Core/Vector/WavevectorInfo.h"
@@ -343,7 +344,6 @@
%include "Core/Parametrization/RangedDistributions.h"
%include "Core/Parametrization/SimulationOptions.h"
%include "Core/Parametrization/ThreadInfo.h"
-%include "Core/Parametrization/Units.h"
%include "Core/Scattering/ISample.h"
%include "Core/Scattering/IFormFactor.h"
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 79ddf49c10d..a20ef70f7d0 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -5175,6 +5175,22 @@ def exp_I(z):
"""
return _libBornAgainCore.exp_I(z)
+
+def rad2deg(angle):
+ r"""
+ rad2deg(double angle) -> double
+ double Units::rad2deg(double angle)
+
+ """
+ return _libBornAgainCore.rad2deg(angle)
+
+def deg2rad(angle):
+ r"""
+ deg2rad(double angle) -> double
+ double Units::deg2rad(double angle)
+
+ """
+ return _libBornAgainCore.deg2rad(angle)
class WavevectorInfo(object):
r"""
@@ -5245,6 +5261,24 @@ class WavevectorInfo(object):
# Register WavevectorInfo in _libBornAgainCore:
_libBornAgainCore.WavevectorInfo_swigregister(WavevectorInfo)
+nanometer = cvar.nanometer
+angstrom = cvar.angstrom
+micrometer = cvar.micrometer
+millimeter = cvar.millimeter
+meter = cvar.meter
+nm = cvar.nm
+nm2 = cvar.nm2
+barn = cvar.barn
+radian = cvar.radian
+milliradian = cvar.milliradian
+degree = cvar.degree
+steradian = cvar.steradian
+rad = cvar.rad
+mrad = cvar.mrad
+sr = cvar.sr
+deg = cvar.deg
+tesla = cvar.tesla
+gauss = cvar.gauss
def WavevectorInfo_GetZeroQ():
r"""WavevectorInfo_GetZeroQ() -> WavevectorInfo"""
@@ -7862,22 +7896,6 @@ class ThreadInfo(object):
# Register ThreadInfo in _libBornAgainCore:
_libBornAgainCore.ThreadInfo_swigregister(ThreadInfo)
-
-def rad2deg(angle):
- r"""
- rad2deg(double angle) -> double
- double Units::rad2deg(double angle)
-
- """
- return _libBornAgainCore.rad2deg(angle)
-
-def deg2rad(angle):
- r"""
- deg2rad(double angle) -> double
- double Units::deg2rad(double angle)
-
- """
- return _libBornAgainCore.deg2rad(angle)
class ISample(ICloneable, INode):
r"""
@@ -7941,24 +7959,6 @@ class ISample(ICloneable, INode):
# Register ISample in _libBornAgainCore:
_libBornAgainCore.ISample_swigregister(ISample)
-nanometer = cvar.nanometer
-angstrom = cvar.angstrom
-micrometer = cvar.micrometer
-millimeter = cvar.millimeter
-meter = cvar.meter
-nm = cvar.nm
-nm2 = cvar.nm2
-barn = cvar.barn
-radian = cvar.radian
-milliradian = cvar.milliradian
-degree = cvar.degree
-steradian = cvar.steradian
-rad = cvar.rad
-mrad = cvar.mrad
-sr = cvar.sr
-deg = cvar.deg
-tesla = cvar.tesla
-gauss = cvar.gauss
class IFormFactor(ISample):
r"""
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 6238a2be6df..d8422edd14a 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -7016,7 +7016,7 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Core/Parametrization/RealParameter.h"
#include "Core/Parametrization/SimulationOptions.h"
#include "Core/Parametrization/ThreadInfo.h"
-#include "Core/Parametrization/Units.h"
+#include "Core/Basics/Units.h"
#include "Core/Particle/Crystal.h"
#include "Core/Particle/FormFactorCrystal.h"
#include "Core/Particle/FormFactorWeighted.h"
@@ -49252,6 +49252,304 @@ fail:
}
+SWIGINTERN int Swig_var_nanometer_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable nanometer is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_nanometer_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::nanometer));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_angstrom_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable angstrom is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_angstrom_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::angstrom));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_micrometer_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable micrometer is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_micrometer_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::micrometer));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_millimeter_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable millimeter is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_millimeter_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::millimeter));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_meter_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable meter is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_meter_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::meter));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_nm_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable nm is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_nm_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::nm));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_nm2_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable nm2 is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_nm2_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::nm2));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_barn_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable barn is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_barn_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::barn));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_radian_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable radian is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_radian_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::radian));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_milliradian_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable milliradian is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_milliradian_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::milliradian));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_degree_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable degree is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_degree_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::degree));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_steradian_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable steradian is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_steradian_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::steradian));
+ return pyobj;
+}
+
+
+SWIGINTERN PyObject *_wrap_rad2deg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ double arg1 ;
+ double val1 ;
+ int ecode1 = 0 ;
+ PyObject *swig_obj[1] ;
+ double result;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
+ if (!SWIG_IsOK(ecode1)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "rad2deg" "', argument " "1"" of type '" "double""'");
+ }
+ arg1 = static_cast< double >(val1);
+ result = (double)Units::rad2deg(arg1);
+ resultobj = SWIG_From_double(static_cast< double >(result));
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_deg2rad(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ double arg1 ;
+ double val1 ;
+ int ecode1 = 0 ;
+ PyObject *swig_obj[1] ;
+ double result;
+
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
+ if (!SWIG_IsOK(ecode1)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "deg2rad" "', argument " "1"" of type '" "double""'");
+ }
+ arg1 = static_cast< double >(val1);
+ result = (double)Units::deg2rad(arg1);
+ resultobj = SWIG_From_double(static_cast< double >(result));
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN int Swig_var_rad_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable rad is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_rad_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::rad));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_mrad_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable mrad is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_mrad_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::mrad));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_sr_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable sr is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_sr_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::sr));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_deg_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable deg is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_deg_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::deg));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_tesla_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable tesla is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_tesla_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::tesla));
+ return pyobj;
+}
+
+
+SWIGINTERN int Swig_var_gauss_set(PyObject *) {
+ SWIG_Error(SWIG_AttributeError,"Variable gauss is read-only.");
+ return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_gauss_get(void) {
+ PyObject *pyobj = 0;
+
+ pyobj = SWIG_From_double(static_cast< double >(Units::gauss));
+ return pyobj;
+}
+
+
SWIGINTERN PyObject *_wrap_WavevectorInfo_GetZeroQ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
SwigValueWrapper< WavevectorInfo > result;
@@ -67075,304 +67373,6 @@ SWIGINTERN PyObject *ThreadInfo_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN int Swig_var_nanometer_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable nanometer is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_nanometer_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::nanometer));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_angstrom_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable angstrom is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_angstrom_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::angstrom));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_micrometer_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable micrometer is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_micrometer_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::micrometer));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_millimeter_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable millimeter is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_millimeter_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::millimeter));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_meter_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable meter is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_meter_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::meter));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_nm_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable nm is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_nm_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::nm));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_nm2_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable nm2 is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_nm2_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::nm2));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_barn_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable barn is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_barn_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::barn));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_radian_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable radian is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_radian_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::radian));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_milliradian_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable milliradian is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_milliradian_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::milliradian));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_degree_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable degree is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_degree_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::degree));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_steradian_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable steradian is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_steradian_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::steradian));
- return pyobj;
-}
-
-
-SWIGINTERN PyObject *_wrap_rad2deg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double arg1 ;
- double val1 ;
- int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "rad2deg" "', argument " "1"" of type '" "double""'");
- }
- arg1 = static_cast< double >(val1);
- result = (double)Units::rad2deg(arg1);
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_deg2rad(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double arg1 ;
- double val1 ;
- int ecode1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "deg2rad" "', argument " "1"" of type '" "double""'");
- }
- arg1 = static_cast< double >(val1);
- result = (double)Units::deg2rad(arg1);
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN int Swig_var_rad_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable rad is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_rad_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::rad));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_mrad_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable mrad is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_mrad_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::mrad));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_sr_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable sr is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_sr_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::sr));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_deg_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable deg is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_deg_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::deg));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_tesla_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable tesla is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_tesla_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::tesla));
- return pyobj;
-}
-
-
-SWIGINTERN int Swig_var_gauss_set(PyObject *) {
- SWIG_Error(SWIG_AttributeError,"Variable gauss is read-only.");
- return 1;
-}
-
-
-SWIGINTERN PyObject *Swig_var_gauss_get(void) {
- PyObject *pyobj = 0;
-
- pyobj = SWIG_From_double(static_cast< double >(Units::gauss));
- return pyobj;
-}
-
-
SWIGINTERN PyObject *_wrap_new_ISample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
PyObject *arg1 = (PyObject *) 0 ;
@@ -124389,6 +124389,16 @@ static PyMethodDef SwigMethods[] = {
"Returns exp(I*z), where I is the imaginary unit. \n"
"\n"
""},
+ { "rad2deg", _wrap_rad2deg, METH_O, "\n"
+ "rad2deg(double angle) -> double\n"
+ "double Units::rad2deg(double angle)\n"
+ "\n"
+ ""},
+ { "deg2rad", _wrap_deg2rad, METH_O, "\n"
+ "deg2rad(double angle) -> double\n"
+ "double Units::deg2rad(double angle)\n"
+ "\n"
+ ""},
{ "WavevectorInfo_GetZeroQ", _wrap_WavevectorInfo_GetZeroQ, METH_NOARGS, "WavevectorInfo_GetZeroQ() -> WavevectorInfo"},
{ "new_WavevectorInfo", _wrap_new_WavevectorInfo, METH_VARARGS, "\n"
"WavevectorInfo(cvector_t ki, cvector_t kf, double wavelength)\n"
@@ -126051,16 +126061,6 @@ static PyMethodDef SwigMethods[] = {
{ "delete_ThreadInfo", _wrap_delete_ThreadInfo, METH_O, "delete_ThreadInfo(ThreadInfo self)"},
{ "ThreadInfo_swigregister", ThreadInfo_swigregister, METH_O, NULL},
{ "ThreadInfo_swiginit", ThreadInfo_swiginit, METH_VARARGS, NULL},
- { "rad2deg", _wrap_rad2deg, METH_O, "\n"
- "rad2deg(double angle) -> double\n"
- "double Units::rad2deg(double angle)\n"
- "\n"
- ""},
- { "deg2rad", _wrap_deg2rad, METH_O, "\n"
- "deg2rad(double angle) -> double\n"
- "double Units::deg2rad(double angle)\n"
- "\n"
- ""},
{ "new_ISample", _wrap_new_ISample, METH_VARARGS, "\n"
"ISample()\n"
"new_ISample(PyObject * _self, INode parent, std::vector< char const *,std::allocator< char const * > > const PName, std::vector< char const *,std::allocator< char const * > > const PUnit, vdouble1d_t PMin, vdouble1d_t PMax, vdouble1d_t PDefault, vdouble1d_t P) -> ISample\n"
@@ -139643,9 +139643,6 @@ SWIG_init(void) {
SWIG_addvarlink(globals, "major_version_number", Swig_var_major_version_number_get, Swig_var_major_version_number_set);
SWIG_addvarlink(globals, "minor_version_number", Swig_var_minor_version_number_get, Swig_var_minor_version_number_set);
SWIG_addvarlink(globals, "patch_version_number", Swig_var_patch_version_number_get, Swig_var_patch_version_number_set);
- SWIG_Python_SetConstant(d, "FORWARD_FFT",SWIG_From_int(static_cast< int >(MathFunctions::FORWARD_FFT)));
- SWIG_Python_SetConstant(d, "BACKWARD_FFT",SWIG_From_int(static_cast< int >(MathFunctions::BACKWARD_FFT)));
- SWIG_addvarlink(globals, "INF", Swig_var_INF_get, Swig_var_INF_set);
SWIG_addvarlink(globals, "nanometer", Swig_var_nanometer_get, Swig_var_nanometer_set);
SWIG_addvarlink(globals, "angstrom", Swig_var_angstrom_get, Swig_var_angstrom_set);
SWIG_addvarlink(globals, "micrometer", Swig_var_micrometer_get, Swig_var_micrometer_set);
@@ -139664,6 +139661,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, "FORWARD_FFT",SWIG_From_int(static_cast< int >(MathFunctions::FORWARD_FFT)));
+ SWIG_Python_SetConstant(d, "BACKWARD_FFT",SWIG_From_int(static_cast< int >(MathFunctions::BACKWARD_FFT)));
+ SWIG_addvarlink(globals, "INF", Swig_var_INF_get, Swig_var_INF_set);
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)));
--
GitLab